diff --git a/app/build.gradle b/app/build.gradle index a1f2c54..448d207 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,8 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) // Android - compile 'com.android.support:appcompat-v7:25.2.0' - compile 'com.android.support:recyclerview-v7:25.2.0' + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:recyclerview-v7:25.3.1' // 3rd party compile 'com.jakewharton:butterknife:8.5.1' // View binding diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 78350cb..5b86c08 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified -# in /Users/temp/Desktop/Projects/Android/SDK/tools/proguard/proguard-android.txt +# in ${sdk.dir}/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the proguardFiles # directive in build.gradle. # diff --git a/app/src/main/java/com/mbmc/fiinfo/constant/Preferences.java b/app/src/main/java/com/mbmc/fiinfo/constant/Preferences.java index a32f39e..ee37b0b 100644 --- a/app/src/main/java/com/mbmc/fiinfo/constant/Preferences.java +++ b/app/src/main/java/com/mbmc/fiinfo/constant/Preferences.java @@ -4,7 +4,7 @@ public class Preferences { public static final String HIDE_CODE_INSTRUCTIONS = "code_instructions"; - + public static final String NOTIFICATION_ENABLE = "notification_enable"; public static final String NOTIFICATION_SOUND = "notification_sound"; public static final String NOTIFICATION_VIBRATE = "notification_vibrate"; diff --git a/app/src/main/java/com/mbmc/fiinfo/data/ConnectivityEvent.java b/app/src/main/java/com/mbmc/fiinfo/data/ConnectivityEvent.java index 3fbe10b..d4450be 100644 --- a/app/src/main/java/com/mbmc/fiinfo/data/ConnectivityEvent.java +++ b/app/src/main/java/com/mbmc/fiinfo/data/ConnectivityEvent.java @@ -35,4 +35,4 @@ public ConnectivityEvent(Event event, String name, String mobile, String speed) this.speed = speed; } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mbmc/fiinfo/data/Event.java b/app/src/main/java/com/mbmc/fiinfo/data/Event.java index c91cee9..3c2d1aa 100644 --- a/app/src/main/java/com/mbmc/fiinfo/data/Event.java +++ b/app/src/main/java/com/mbmc/fiinfo/data/Event.java @@ -34,4 +34,4 @@ public static Event get(int type) { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mbmc/fiinfo/helper/Database.java b/app/src/main/java/com/mbmc/fiinfo/helper/Database.java index f3d34b7..d054bfa 100644 --- a/app/src/main/java/com/mbmc/fiinfo/helper/Database.java +++ b/app/src/main/java/com/mbmc/fiinfo/helper/Database.java @@ -55,4 +55,4 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mbmc/fiinfo/receiver/ConnectivityChangeReceiver.java b/app/src/main/java/com/mbmc/fiinfo/receiver/ConnectivityChangeReceiver.java index 1be8a4e..88d3d7e 100644 --- a/app/src/main/java/com/mbmc/fiinfo/receiver/ConnectivityChangeReceiver.java +++ b/app/src/main/java/com/mbmc/fiinfo/receiver/ConnectivityChangeReceiver.java @@ -25,4 +25,4 @@ public void onReceive(Context context, Intent intent) { previousEvent = event; } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mbmc/fiinfo/ui/activity/MainActivity.java b/app/src/main/java/com/mbmc/fiinfo/ui/activity/MainActivity.java index 61f6649..1077a99 100644 --- a/app/src/main/java/com/mbmc/fiinfo/ui/activity/MainActivity.java +++ b/app/src/main/java/com/mbmc/fiinfo/ui/activity/MainActivity.java @@ -49,7 +49,7 @@ public class MainActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks, RefreshListener { - + private static final int URL_LOADER = 0; private static final String[] projection = { Database.COLUMN_ID, diff --git a/app/src/main/java/com/mbmc/fiinfo/ui/adapter/StatAdapter.java b/app/src/main/java/com/mbmc/fiinfo/ui/adapter/StatAdapter.java index 7840018..91579be 100644 --- a/app/src/main/java/com/mbmc/fiinfo/ui/adapter/StatAdapter.java +++ b/app/src/main/java/com/mbmc/fiinfo/ui/adapter/StatAdapter.java @@ -48,4 +48,4 @@ public StatViewHolder(View itemView) { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mbmc/fiinfo/widget/MiniWidgetProvider.java b/app/src/main/java/com/mbmc/fiinfo/widget/MiniWidgetProvider.java index 05c4bc9..2e3dc30 100644 --- a/app/src/main/java/com/mbmc/fiinfo/widget/MiniWidgetProvider.java +++ b/app/src/main/java/com/mbmc/fiinfo/widget/MiniWidgetProvider.java @@ -43,4 +43,4 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a WidgetManager.update(context, this.getClass(), remoteViews, connectivityEvent); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mbmc/fiinfo/widget/WidgetProvider.java b/app/src/main/java/com/mbmc/fiinfo/widget/WidgetProvider.java index d94eaf2..26d3d1d 100644 --- a/app/src/main/java/com/mbmc/fiinfo/widget/WidgetProvider.java +++ b/app/src/main/java/com/mbmc/fiinfo/widget/WidgetProvider.java @@ -95,4 +95,4 @@ private void setAction(Context context, RemoteViews remoteViews, String action, remoteViews.setOnClickPendingIntent(viewId, PendingIntent.getBroadcast(context, 0, intent, 0)); } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/fragment_notification_settings.xml b/app/src/main/res/layout/fragment_notification_settings.xml index 28e8143..e078d85 100644 --- a/app/src/main/res/layout/fragment_notification_settings.xml +++ b/app/src/main/res/layout/fragment_notification_settings.xml @@ -52,4 +52,4 @@ style="@style/SwitchTextAppearance" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_widget_settings.xml b/app/src/main/res/layout/fragment_widget_settings.xml index 53c584b..fd15ca8 100644 --- a/app/src/main/res/layout/fragment_widget_settings.xml +++ b/app/src/main/res/layout/fragment_widget_settings.xml @@ -49,4 +49,4 @@ /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/layout_icon.xml b/app/src/main/res/layout/layout_icon.xml index 3f2bf8e..8dcc14b 100644 --- a/app/src/main/res/layout/layout_icon.xml +++ b/app/src/main/res/layout/layout_icon.xml @@ -23,4 +23,4 @@ android:layout_height="wrap_content" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/layout_widget_1x1.xml b/app/src/main/res/layout/layout_widget_1x1.xml index ccc434d..b2c9f25 100644 --- a/app/src/main/res/layout/layout_widget_1x1.xml +++ b/app/src/main/res/layout/layout_widget_1x1.xml @@ -33,4 +33,4 @@ style="@style/TextViewStyle" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/view_code_instructions.xml b/app/src/main/res/layout/view_code_instructions.xml index 4a1c4d5..a190213 100644 --- a/app/src/main/res/layout/view_code_instructions.xml +++ b/app/src/main/res/layout/view_code_instructions.xml @@ -27,4 +27,4 @@ android:text="@string/code_instructions_hide" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/view_event.xml b/app/src/main/res/layout/view_event.xml index 32bdda8..9937afc 100644 --- a/app/src/main/res/layout/view_event.xml +++ b/app/src/main/res/layout/view_event.xml @@ -36,4 +36,4 @@ android:ellipsize="end" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/view_stat.xml b/app/src/main/res/layout/view_stat.xml index e065f6a..aed2328 100644 --- a/app/src/main/res/layout/view_stat.xml +++ b/app/src/main/res/layout/view_stat.xml @@ -37,4 +37,4 @@ android:ellipsize="end" /> - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9f0a5ee..f4b3d3e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,4 +10,4 @@ #25A667 #FFC30F - \ No newline at end of file + diff --git a/app/src/main/res/xml/widget_1x1.xml b/app/src/main/res/xml/widget_1x1.xml index e7fee09..8c4a84d 100644 --- a/app/src/main/res/xml/widget_1x1.xml +++ b/app/src/main/res/xml/widget_1x1.xml @@ -3,4 +3,4 @@ android:minHeight="40dp" android:initialLayout="@layout/layout_widget_1x1" android:previewImage="@drawable/preview_1x1" - /> \ No newline at end of file + /> diff --git a/app/src/main/res/xml/widget_4x1.xml b/app/src/main/res/xml/widget_4x1.xml index c6c1074..a20ec2b 100644 --- a/app/src/main/res/xml/widget_4x1.xml +++ b/app/src/main/res/xml/widget_4x1.xml @@ -3,4 +3,4 @@ android:minHeight="40dp" android:initialLayout="@layout/layout_widget_4x1" android:previewImage="@drawable/preview_4x1" - /> \ No newline at end of file + /> diff --git a/build.gradle b/build.gradle index 3f806cd..8ccd9c9 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.1' } } diff --git a/gradle.properties b/gradle.properties index 65fa5e7..4642394 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,21 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + VERSION_NAME=0.9 VERSION_CODE=9 PACKAGE=com.mbmc.fiinfo @@ -6,5 +24,3 @@ ANDROID_COMPILE_SDK_VERSION=25 ANDROID_TARGET_SDK_VERSION=23 ANDROID_MIN_SDK_VERSION=23 ANDROID_BUILD_TOOLS=25.0.2 - -org.gradle.jvmargs=-Xmx4608m -XX:MaxPermSize=512m \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64..1336e20 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 184da02..634d5dd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 12 08:52:19 PDT 2017 +#Tue Apr 11 18:40:58 SGT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip diff --git a/gradlew b/gradlew index 91a7e26..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/website/privacy.html b/website/privacy.html index a93edf9..ee11c1f 100644 --- a/website/privacy.html +++ b/website/privacy.html @@ -2,21 +2,21 @@ - Signal Info (formerly FiInfo) - Privacy Policy + Signal Info (formerly FiInfo) - Privacy Policy - +

Signal Info Privacy Policy

- +
- Signal Info requires the `Phone` permission in order to detect connectivity changes. When such even occurs, the app logs data such as, but not limited to, time of the event’s occurrence, WiFi or cell signal name, time zone. Those logs are saved on the device, and are not stored or shared anywhere else. + Signal Info requires the `Phone` permission in order to detect connectivity changes. When such even occurs, the app logs data such as, but not limited to, time of the event’s occurrence, WiFi or cell signal name, time zone. Those logs are saved on the device, and are not stored or shared anywhere else.

For any questions, please contact mbmc.dev at gmail
- \ No newline at end of file +