Merge pull request #530 from SecUpwN/development

Unchaining WIP-Release v0.1.31-alpha-build-00

.travis.yml

@@ -77,3 +77,4 @@ addons:
     build_command_prepend: "./gradlew clean"
     build_command: "./gradlew build"
     branch_pattern: development
+    build_script_url: https://spideroak.com/share/IFEU2U2JINCA/GitHub/home/SecUpwN/SpiderOak/MISC/external/travisci_build_coverity_scan.sh

CHANGELOG.md

@@ -1,6 +1,116 @@
 # CHANGELOG of 'AIMSICD'
 ----------------------
 
+#### [05.07.2015 - WIP-Release v0.1.31-alpha-build-00](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/releases/tag/v0.1.31-alpha-b00)
+
+* Removed: Commented out unused imports and re-ordered variable declarations
+* Updated: Shortened badge of `Development Status` in `README` for better display
+* Added: More clarifying code co´mments in `CellTracker.java`
+
+#### 05.07.2015 - WIP-Internal v0.1.30-alpha-build-16
+
+* Fixed: Cleanup of timestamp code in `MiscUtils.java`
+* Fixed: AIMSICD Status-Icons are now shown correctly in colored style on Android 5+
+
+
+---
+
+#### 04.07.2015 - WIP-Internal v0.1.30-alpha-build-14
+
+* Added: New Log items for MCC and MNC parameters when downloading OCID for debugging
+* Fixed: Reformatted 23 char limitation of Log TAG with our standard TAG, mTAG + "text"
+* Fixed: Corrected MiscUtils TAGs and nulls in CellTracker and improved some formatting
+* Fixed: Silenced even more XPrivacy logcat spam in DebugLogs
+
+---
+
+#### 03.07.2015 - WIP-Internal v0.1.30-alpha-build-13
+
+* Fixed: Comments in `RequestTask.java` have been fixed to reflect code changes
+* Fixed: Silenced some spammy XPrivacy items using: `XPrivacy/XRuntime:S Xposed:S`
+
+---
+
+#### 03.07.2015 - WIP-Internal v0.1.30-alpha-build-12
+
+* Added: Weblate translations badge added to our `README` for people to see progress
+* Fixed: AIMSICD should now start again properly on previously complaining devices
+
+---
+
+#### 03.07.2015 - WIP-Internal v0.1.30-alpha-build-11
+
+* Updated: `CREDITS` now reflect the latest awesome additions by our new developers
+* Fixed: Small string fixes and translation improvements to move our new [Weblate](https://hosted.weblate.org/projects/aimsicd/strings/).
+
+---
+
+#### 03.07.2015 - WIP-Internal v0.1.30-alpha-build-10
+
+* Fixed: Now truncating measured and used Lat/Lon GPS coordinates in `LocationTracker`
+
+---
+
+#### 27.06.2015 - WIP-Internal v0.1.30-alpha-build-09
+
+* Changed: Timeout value in `RequestTask.java` has been increased to 80 seconds
+* Fixed: Repaired OCIDCSV parsing which obviously temporarily broke during development
+
+---
+
+#### 27.06.2015 - WIP-Internal v0.1.30-alpha-build-08
+
+* Added: Buildozer Buildnumber to has been added to About View for development builds
+
+---
+
+#### 26.06.2015 - WIP-Internal v0.1.30-alpha-build-07
+
+* Changed: mTAG has been changed as requested to `SamsungMulticlientRilExecutor`
+* Added: Small warning within code to not remove commented out stuff without prior asking
+
+---
+
+#### 25.06.2015 - WIP-Internal v0.1.30-alpha-build-06
+
+* Updated: Log calls updated to common TAGs, added doublepoints and removed whitespaces
+
+---
+
+#### 25.06.2015 - WIP-Internal v0.1.30-alpha-build-05
+
+* Changed: Customized build script in `.travis.yml` to override CoverityScan limits
+* Changed: Made toast property static and non-final, splitting toast creation for `msgShort`
+* Removed: Commented out `LeakCanary` until this libray has reived some code improvemens
+* Fixed: Toasts are now displayed in the ccorrect position and duration to really read them
+
+---
+
+#### 24.06.2015 - WIP-Internal v0.1.30-alpha-build-04
+
+* Added: Toasts are now being cancelled on new toast to prevent overapping of toasts
+
+---
+
+#### 24.06.2015 - WIP-Internal v0.1.30-alpha-build-03
+
+* Fixed: Info box toasts are now shown longer by adding a new singleton toaster
+
+---
+
+#### 23.06.2015 - WIP-Internal v0.1.30-alpha-build-02
+
+* Changed: Context property changed to `appContext` in `DrawerMenuAdapter.java`
+* Removed: Purged `this` prefix of `appContext` as it is not needed anymore
+
+---
+
+#### 23.06.2015 - WIP-Internal v0.1.30-alpha-build-01
+
+* Changed: Help toast has been changed to long toast in `DrawerMenuAdapter.java`
+
+---
+
 #### [21.06.2015 - WIP-Release v0.1.30-alpha-build-00](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/releases/tag/v0.1.30-alpha-b00)
 
 * Updated: Refactored OpenCellId activity for better code quality and error handling

CONTRIBUTING.md

@@ -23,11 +23,9 @@ Feel invited to develop with us using these steps:
 
 Let our app start up in your native language!
 
-* Copy file [translatable_strings.xml](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/raw/development/app/src/main/res/values/translatable_strings.xml) into your values-[code](https://en.wikipedia.org/wiki/ISO_639-1) folder.
-* Example: `app/src/main/res/values-de/translatable_strings.xml`
-* Translate the xml-file with an Editor, Android Studio or IntelliJ IDEA.
-6. Increase the build number `*-alpha-bXX` in `android:versionName`.
-7. Test your changes and submit a [pull request](https://help.github.com/articles/using-pull-requests/) when we shall add it.
+* See [our translations](https://hosted.weblate.org/projects/aimsicd/strings/) and login via [GitHub](https://hosted.weblate.org/accounts/login/github/?next=/projects/aimsicd/strings/) or [others](https://hosted.weblate.org/accounts/login/?next=/projects/aimsicd/strings/) to add yours.
+* When translating, keep small device screens in mind. Shorten it.
+* Translations will be pulled into our GitHub automatically. Enjoy!
 
 ---
 

README.md

@@ -1,6 +1,6 @@
 ### Android IMSI-Catcher Detector
 
-[![BuildStatus](https://travis-ci.org/SecUpwN/Android-IMSI-Catcher-Detector.svg)](https://travis-ci.org/SecUpwN/Android-IMSI-Catcher-Detector) [![DevelopmentStatus](http://img.shields.io/badge/Development_Status-ALPHA-brightgreen.svg)](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Development-Status) [![CoverityScan](https://scan.coverity.com/projects/3346/badge.svg)](https://scan.coverity.com/projects/3346)
+[![BuildStatus](https://travis-ci.org/SecUpwN/Android-IMSI-Catcher-Detector.svg)](https://travis-ci.org/SecUpwN/Android-IMSI-Catcher-Detector) [![DevelopmentStatus](http://img.shields.io/badge/Development-ALPHA-brightgreen.svg)](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Development-Status) [![CoverityScan](https://scan.coverity.com/projects/3346/badge.svg)](https://scan.coverity.com/projects/3346) [![Translations](https://hosted.weblate.org/widgets/aimsicd/-/shields-badge.svg)](https://hosted.weblate.org/projects/aimsicd/strings/)
 [![Bountysource](https://www.bountysource.com/badge/team?team_id=40338&style=bounties_received)](https://www.bountysource.com/teams/android-imsi-catcher-detector/issues?utm_source=Android%20IMSI-Catcher%20Detector&utm_medium=shield&utm_campaign=bounties_received)
 
 --

app/build.gradle

@@ -56,9 +56,15 @@ android {
             } catch (MissingPropertyException e) {
                 buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
             }
+            try {
+                buildConfigField 'String', 'BUILDOZER_BUILDNUMBER', '\"' + System.getenv("BUILDOZER_BUILDNUMBER") + '\"'
+            } catch (MissingPropertyException e) {
+                buildConfigField 'String', 'BUILDOZER_BUILDNUMBER', '"NA"'
+            }
         }
         release {
             buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
+            buildConfigField 'String', 'BUILDOZER_BUILDNUMBER', '"NA"'
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
@@ -125,6 +131,7 @@ android {
 }
 
 dependencies {
+    // DO NOT REMOVE BELOW COMMENTED-OUT CODE BEFORE ASKING!
     //compile 'com.github.amlcurran.showcaseview:library:5.0.0'
     //compile 'com.android.support:appcompat-v7:22.1.1'
     //https://github.com/lp0/slf4j-android
@@ -140,6 +147,6 @@ dependencies {
     compile 'com.nineoldandroids:library:2.4.0'
     compile 'org.apache.commons:commons-lang3:3.3.2'
     compile 'com.google.code.gson:gson:2.2.4'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
-}
+    //debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
+    //releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
+}

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.SecUpwN.AIMSICD"
-          android:versionCode="30"
-          android:versionName="0.1.30-alpha-b00">
+          android:versionCode="31"
+          android:versionName="0.1.31-alpha-b00">
 
     <!-- If we ever wanna make this a system app, we can add the following 2 lines above:
           coreApp="true"
@@ -204,4 +204,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/assets/CREDITS

@@ -221,4 +221,10 @@ for OCID improvements and code fixes.\n
 \n
 Willem van Engen\n
 https://github.com/wvengen\n
-for improving database imports.
+for improving database imports.\n
+\n
+Daniel Jäger\n
+https://github.com/DJaeger\n
+for your unbelievable endurance\n
+and all the lovely coding. THANK YOU!\n
+\n

app/src/main/java/com/SecUpwN/AIMSICD/AppAIMSICD.java

@@ -14,13 +14,15 @@
 import com.SecUpwN.AIMSICD.constants.TinyDbKeys;
 import com.SecUpwN.AIMSICD.utils.BaseAsyncTask;
 import com.SecUpwN.AIMSICD.utils.TinyDB;
-import com.squareup.leakcanary.LeakCanary;
+// DO NOT REMOVE BELOW COMMENTED-OUT CODE BEFORE ASKING!
+//import com.squareup.leakcanary.LeakCanary;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class AppAIMSICD extends Application {
-    final static String TAG = "AppAIMSICD";
+    final static String TAG = "AIMSICD";
+    final static String mTAG = "AppAIMSICD";
 
     /**
      * Maps between an activity class name and the list of currently running
@@ -35,7 +37,8 @@ public AppAIMSICD() {
     @Override
     public void onCreate() {
         super.onCreate();
-        LeakCanary.install(this);
+        // DO NOT REMOVE BELOW COMMENTED-OUT CODE BEFORE ASKING!
+        //LeakCanary.install(this);
         TinyDB.getInstance().init(getApplicationContext());
         TinyDB.getInstance().putBoolean(TinyDbKeys.FINISHED_LOAD_IN_MAP, true);
     }
@@ -49,7 +52,7 @@ public void removeTask(BaseAsyncTask<?, ?, ?> pTask) {
                 if (lTask.equals(pTask)) {
                     tasks.remove(lTask);
                     if (BuildConfig.DEBUG) {
-                        Log.v(TAG, "BaseTask removed:" + pTask.toString());
+                        Log.v(TAG, mTAG + ": BaseTask removed:" + pTask.toString());
                     }
                     break;
                 }
@@ -66,7 +69,7 @@ public void addTask(Activity activity, BaseAsyncTask<?, ?, ?> pTask) {
             return;
         }
         if (BuildConfig.DEBUG) {
-            Log.d(TAG, "BaseTask addTask activity:" + activity.getClass().getCanonicalName());
+            Log.d(TAG, mTAG + ": BaseTask addTask activity:" + activity.getClass().getCanonicalName());
         }
         int key = activity.getClass().getCanonicalName().hashCode();
         List<BaseAsyncTask<?, ?, ?>> tasks = mActivityTaskMap.get(key);
@@ -75,7 +78,7 @@ public void addTask(Activity activity, BaseAsyncTask<?, ?, ?> pTask) {
             mActivityTaskMap.put(key, tasks);
         }
         if (BuildConfig.DEBUG) {
-            Log.v(TAG, "BaseTask added:" + pTask.toString());
+            Log.v(TAG, mTAG + ": BaseTask added:" + pTask.toString());
         }
         tasks.add(pTask);
     }
@@ -85,7 +88,7 @@ public void detach(Activity activity) {
             return;
         }
         if (BuildConfig.DEBUG) {
-            Log.d(TAG, "BaseTask detach:" + activity.getClass().getCanonicalName());
+            Log.d(TAG, mTAG + ": BaseTask detach:" + activity.getClass().getCanonicalName());
         }
 
         List<BaseAsyncTask<?, ?, ?>> tasks = mActivityTaskMap.get(activity.getClass().getCanonicalName().hashCode());
@@ -101,7 +104,7 @@ public void attach(Activity activity) {
             return;
         }
         if (BuildConfig.DEBUG) {
-            Log.d(TAG, "BaseTask attach:" + activity.getClass().getCanonicalName());
+            Log.d(TAG, mTAG + ": BaseTask attach:" + activity.getClass().getCanonicalName());
         }
         List<BaseAsyncTask<?, ?, ?>> tasks = mActivityTaskMap.get(activity.getClass().getCanonicalName().hashCode());
         if (tasks != null) {
@@ -110,5 +113,4 @@ public void attach(Activity activity) {
             }
         }
     }
-}
-
+}

app/src/main/java/com/SecUpwN/AIMSICD/activities/BaseActivity.java

@@ -25,15 +25,17 @@
  * @author Tor Henning Ueland
  */
 public class BaseActivity extends FragmentActivity {
-    private static String TAG = "BaseActivity";
+    private static final String TAG = "AIMSICD";
+    private static final String mTAG = "BaseActivity";
+
 
     /**
      * Triggered when GUI is opened
      */
     @Override
     protected void onResume() {
         super.onResume();
-        Log.d(TAG, "StatusWatcher starting watching");
+        Log.d(TAG, mTAG + ": StatusWatcher starting watching");
         LocalBroadcastManager.getInstance(this).registerReceiver(mMessageReceiver,
                 new IntentFilter("StatusChange"));
         updateIcon(this);
@@ -45,7 +47,7 @@ protected void onResume() {
     private BroadcastReceiver mMessageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            Log.d(TAG, "StatusWatcher received status change to " + Status.getStatus().name()+", updating icon");
+            Log.d(TAG, mTAG +  ": StatusWatcher received status change to " + Status.getStatus().name()+", updating icon");
                     updateIcon(context);
         }
     };
@@ -69,7 +71,7 @@ public void run() {
     @Override
     protected void onPause() {
         super.onPause();
-        Log.d(TAG, "StatusWatcher stopped watching");
+        Log.d(TAG, mTAG + ": StatusWatcher stopped watching");
         LocalBroadcastManager.getInstance(this).unregisterReceiver(mMessageReceiver);
     }
 }