Merge pull request #494 from SecUpwN/development

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

CHANGELOG.md

@@ -1,6 +1,76 @@
 # CHANGELOG of 'AIMSICD'
 ----------------------
 
+#### [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
+* Updated: A few more wording improvements for our `README` and additions in `CREDITS`
+* Changed: Removed references and links to organizations not supporting our project
+* Changed: Improved `LOGTAG` to use proper class name `SmsDetectionDbHelper`
+* Added: Refresh Rate is now shown on menu entry in `Preferences` without opening it
+* Fixed: Made buttons in `About` menu reappear and fixed code for shrinked buttons
+* Fixed: Resolved reappearance of too many unnecessary database open/close operations
+
+---
+
+#### 17.06.2015 - WIP-Internal v0.1.29-alpha-build-06
+
+* Updated: Slight translation updates of strings due to previous menu changes
+* Changed: Removed unused imports and shrinked some buttons in `About` menu
+* Fixed: Resolved UI Issue in `Database Viewer` and corrected button link naming
+
+---
+
+#### 17.06.2015 - WIP-Internal v0.1.29-alpha-build-05
+
+* Changed: Removed old copyright and code of unused Femtocell toggle button
+* Added: New `logcatTimeStampParser` for friendly timestamp from a logcat string
+* Fixed: Endlessly receiving the same detected SMS has finally come to an end
+* Fixed: Exception on UI and database has been fixed (possibly just tentative)
+
+---
+
+#### 16.06.2015 - WIP-Internal v0.1.29-alpha-build-04
+
+* Updated: Better RIL/API support with refreshed `ServiceMode` parser
+* Updated: Increased timeout of OCID download to avoid retrieval errors
+* Added: New feature to read OCID data from generated [lacells.db](https://github.com/n76/Local-GSM-Backend) as well
+* Fixed: Resolved WIN DEATH when using Advanced User Preferences
+* Fixed: Startup crash fixed with `Lat` and `Lng` in `AIMSICDDbAdapter.java`
+
+--- 
+
+#### 12.06.2015 - WIP-Internal v0.1.29-alpha-build-03
+
+* Changed: Moved hardcoding of OCDB download path to static variable
+* Updated: Refactored OCID CSV parsing and truncated GPS coordinates
+
+---
+
+#### 09.06.2015 - WIP-Internal v0.1.29-alpha-build-02
+
+* Updated: Improved menu translations in `Navigation Drawer` for better understanding
+
+---
+
+#### 08.06.2015 - WIP-Internal v0.1.29-alpha-build-01
+
+* Removed: Purged unused imports and unnecessary `toString` calls
+* Removed: Purged public modifier from interface methods
+* Changed: Switched CoverityScan analysis to branch `development` to analyze current code
+* Changed: Replaced deprecated `GridMarkerClusterer` with `RadiusMarkerClusterer`
+* Changed: Closed some database cursors and replaced `dp` with `sp` for TextViews
+* Updated: License header has been unified across all source files to ensure proper GPL
+* Updated: Refactored `AIMSICDDbAdapter::DbHelper#onCreate` for easier reading
+* Updated: Refactored redundant parsing from get OCID API request
+* Added: Default `locale` has been implemented into `SimpleDateFormat` constructor
+* Added: Now using parent view instead of null when inflating layouts
+* Added: French translations as well as `leakcanary` analysis for detecting leaks
+* Fixed: Minor translation and punctuation improvements in several translation string files
+* Fixed: Corrected filename of CSV loaded in into `AIMSICDDbAdapter#updateOpenCellID`
+
+---
+
 #### [31.05.2015 - WIP-Release v0.1.29-alpha-build-00](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/releases/tag/v0.1.29-alpha-b00)
 
 * Added: New WAP Push Detection and corresponding popup as well as custom strings

CONTRIBUTING.md

@@ -55,7 +55,6 @@ Thank you for encouraging our developers!
 
 Special positions we are currently seeking skilled people for:
 
-* People with equipment to verify our app (e.g. OpenBTS).
 * People with a CryptoPhone for double app verification.
 * Fixing the identified [Coverity Scan Defects](https://scan.coverity.com/projects/3346) of our app.
 * Whistleblower working for an IMSI-Catcher producer.

README.md

@@ -89,13 +89,7 @@ Please follow [how to correctly submit Issues](https://github.com/SecUpwN/Androi
 
 ### Support
 
-Although this project is fully Open Source, developing AIMSICD is a lot of work and done by enthusiastic people during their free time. If you're a developer yourself, we welcome you with open arms! To keep developers in a great mood and support development, please consider making a (fully anonymous) [donation](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Donations).
-
-All collected donations shall be split into appropriate pieces and directly sent to developers who contribute useful code (at our discretion). Additionally, donations will be used to support these privacy organizations (contact us if you are a like-minded organization):
-
-[![EFF](https://spideroak.com/share/IFEU2U2JINCA/GitHub/home/SecUpwN/SpiderOak/MISC/external/EFF.png)](https://www.eff.org/)
-[![Guardian Project](https://spideroak.com/share/IFEU2U2JINCA/GitHub/home/SecUpwN/SpiderOak/MISC/external/GuardianProject.png)](https://guardianproject.info/)
-[![Privacy International](https://spideroak.com/share/IFEU2U2JINCA/GitHub/home/SecUpwN/SpiderOak/MISC/external/PrivacyInternational.png)](https://www.privacyinternational.org/)
+Although this project is fully Open Source, developing AIMSICD is a lot of work and done by enthusiastic people during their free time. If you're a developer yourself, we welcome you with open arms! To keep developers in a great mood and support development, please consider making a [donation](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Donations). It will be split into appropriate pieces and directly sent to developers who solved the backed Issue.
 
 ---
 

app/build.gradle

@@ -38,12 +38,12 @@ def getManifestVersionName() {
 //======================================================================
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
     buildToolsVersion '21.1.2'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionCode = getManifestVersionCode()
         versionName = getManifestVersionName()
         testApplicationId "com.SecUpwN.AIMSICD.test"
@@ -125,13 +125,13 @@ android {
 }
 
 dependencies {
-    //    compile 'com.github.amlcurran.showcaseview:library:5.0.0'
+    //compile 'com.github.amlcurran.showcaseview:library:5.0.0'
+    //compile 'com.android.support:appcompat-v7:22.1.1'
+    //https://github.com/lp0/slf4j-android
     compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':third_party:rootshell')
     compile 'com.android.support:support-v4:19.1.0'
-    //compile 'com.android.support:appcompat-v7:22.1.1'
     compile 'org.osmdroid:osmdroid-android:4.2'
-    //https://github.com/lp0/slf4j-android
     compile 'org.slf4j:slf4j-api:1.7.12'
     compile 'eu.lp0.slf4j:slf4j-android:1.7.12-0'
     compile 'org.apache.httpcomponents:httpmime:4.2.1'
@@ -140,4 +140,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'
 }

app/src/androidTest/java/com/SecUpwN/AIMSICD/test/Detection1.java

@@ -1,3 +1,8 @@
+/* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
+ * -----------------------------------------------------------
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
+ * -----------------------------------------------------------
+ */
 package com.SecUpwN.AIMSICD.test;
 
 import android.test.AndroidTestCase;

app/src/androidTest/java/com/SecUpwN/AIMSICD/test/DummyTest.java

@@ -1,3 +1,8 @@
+/* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
+ * -----------------------------------------------------------
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
+ * -----------------------------------------------------------
+ */
 package com.SecUpwN.AIMSICD.test;
 
 import android.test.ActivityInstrumentationTestCase2;

app/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java

@@ -1,14 +1,14 @@
+/* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
+ * -----------------------------------------------------------
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
+ * -----------------------------------------------------------
+ */
 package com.SecUpwN.AIMSICD.test;
 
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.AndroidTestCase;
 import android.util.Log;
-import android.widget.Toast;
 
-import com.SecUpwN.AIMSICD.AIMSICD;
 import com.SecUpwN.AIMSICD.activities.DebugLogs;
-import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter;
-import com.SecUpwN.AIMSICD.utils.Cell;
 
 import java.io.IOException;
 

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="28"
-          android:versionName="0.1.29-alpha-b00">
+          android:versionCode="30"
+          android:versionName="0.1.30-alpha-b00">
 
     <!-- If we ever wanna make this a system app, we can add the following 2 lines above:
           coreApp="true"

app/src/main/assets/CREDITS

@@ -195,18 +195,30 @@ X-Cell Technologies\n
 http://x-cellular.com\n
 for their generous help\n
 and recommendations!\n
+(SPECIAL THANKS to Theo)\n
 \n
 Roberto Tyley\n
 https://github.com/rtyley\n
-for his wonderful BFG Repo-Cleaner.\n
+for your wonderful BFG Repo-Cleaner.\n
 https://rtyley.github.io/bfg-repo-cleaner/\n
 \n
+Bountysource\n
+https://www.bountysource.com/
+for enabling funding of our project. ;-)
+\n
 agilob\n
 http://b.agilob.net/\n
 for enabling app TRANSLATIONS and\n
-his BOUNTY on silent SMS detection!\n
+your BOUNTY on silent SMS detection!\n
 \n
 Dima Kozhevin\n
 https://github.com/DimaKoz\n
 for so many great fixes and additions!\n
 \n
+Marvin M. Arnold\n
+https://github.com/marvinmarnold\n
+for OCID improvements and code fixes.\n
+\n
+Willem van Engen\n
+https://github.com/wvengen\n
+for improving database imports.

app/src/main/assets/CreateDBe_import.sql

@@ -1,3 +1,9 @@
+/* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
+ * -----------------------------------------------------------
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
+ * -----------------------------------------------------------
+ */
+
 -- PRAGMA foreign_keys=OFF;
 -- BEGIN TRANSACTION;
 

app/src/main/assets/aimsicd.sql

@@ -1,18 +1,24 @@
+/* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
+ * -----------------------------------------------------------
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
+ * -----------------------------------------------------------
+ */
+
 /*
-=======================================================================
+========================================================================
 FileName:	aimsicd.sql
 Version:	0.1
 Formatting:	8 char TAB, ASCII, UNIX EOL
 Author:		E:V:A (Team AIMSICD)
 Date:		2015-01-20
 Info:		https://github.com/SecUpwN/Android-IMSI-Catcher-Detector
-=======================================================================
+========================================================================
 
 Description:
 
 	This is the aimsicd.db SQL script. It is used in the 
 	"Android IMIS-Cather Detector" (AIMSICD) application, 
-	to create all and pre-populate some its DB tables.
+	to create all and pre-populate some of its DB tables.
 
 Dependencies:
 

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

@@ -1,32 +1,26 @@
 /* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
  * -----------------------------------------------------------
- * LICENSE:  http://git.io/vJaf6 | TERMS:  http://git.io/vJMf5
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
  * -----------------------------------------------------------
  */
 package com.SecUpwN.AIMSICD;
 
 import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.ComponentName;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
-import android.provider.MediaStore;
 import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.DrawerLayout;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -42,18 +36,14 @@
 import com.SecUpwN.AIMSICD.activities.MapViewerOsmDroid;
 import com.SecUpwN.AIMSICD.activities.PrefActivity;
 import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter;
-import com.SecUpwN.AIMSICD.adapters.DrawerMenuAdapter;
 import com.SecUpwN.AIMSICD.constants.DrawerMenu;
 import com.SecUpwN.AIMSICD.drawer.DrawerMenuActivityConfiguration;
-import com.SecUpwN.AIMSICD.drawer.DrawerMenuItem;
-import com.SecUpwN.AIMSICD.drawer.DrawerMenuSection;
 import com.SecUpwN.AIMSICD.drawer.NavDrawerItem;
 import com.SecUpwN.AIMSICD.fragments.AboutFragment;
 import com.SecUpwN.AIMSICD.fragments.AtCommandFragment;
 import com.SecUpwN.AIMSICD.fragments.DetailsContainerFragment;
 import com.SecUpwN.AIMSICD.service.AimsicdService;
 import com.SecUpwN.AIMSICD.service.CellTracker;
-import com.SecUpwN.AIMSICD.smsdetection.SmsDetectionDbAccess;
 import com.SecUpwN.AIMSICD.smsdetection.SmsDetectionDbHelper;
 import com.SecUpwN.AIMSICD.utils.AsyncResponse;
 import com.SecUpwN.AIMSICD.utils.Cell;
@@ -64,20 +54,7 @@
 import com.SecUpwN.AIMSICD.utils.MiscUtils;
 import com.SecUpwN.AIMSICD.utils.RequestTask;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -314,9 +291,9 @@ void selectItem(int position) {
                 break;
         }
 
-        if (selectedItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_AIMSICD_MONITORING) {
+        if (selectedItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_ATTACK_DETECTION) {
             monitorcell();
-        } else if (selectedItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_2G_ONLY_NETWORK) {
+        } else if (selectedItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_CELL_TRACKING) {
             trackcell();
         } else if (selectedItem.getId() == DrawerMenu.ID.TRACKING.TRACK_FEMTOCELL) {
             trackFemtocell();
@@ -527,9 +504,9 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
         List<NavDrawerItem> menuItems = mNavConf.getNavItems();
         for(NavDrawerItem lItem:menuItems) {
-            if(lItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_AIMSICD_MONITORING) {
+            if(lItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_ATTACK_DETECTION) {
                 cellMonitoringItem = lItem;
-            } else if(lItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_2G_ONLY_NETWORK) {
+            } else if(lItem.getId() == DrawerMenu.ID.TRACKING.TOGGLE_CELL_TRACKING) {
                 cellTrackingItem = lItem;
             } else if(lItem.getId() == DrawerMenu.ID.TRACKING.TRACK_FEMTOCELL) {
                 femtoTrackingItem = lItem;

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

@@ -1,6 +1,6 @@
 /* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
  * -----------------------------------------------------------
- * LICENSE:  http://git.io/vJaf6 | TERMS:  http://git.io/vJMf5
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
  * -----------------------------------------------------------
  */
 package com.SecUpwN.AIMSICD;
@@ -14,6 +14,7 @@
 import com.SecUpwN.AIMSICD.constants.TinyDbKeys;
 import com.SecUpwN.AIMSICD.utils.BaseAsyncTask;
 import com.SecUpwN.AIMSICD.utils.TinyDB;
+import com.squareup.leakcanary.LeakCanary;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,6 +35,7 @@ public AppAIMSICD() {
     @Override
     public void onCreate() {
         super.onCreate();
+        LeakCanary.install(this);
         TinyDB.getInstance().init(getApplicationContext());
         TinyDB.getInstance().putBoolean(TinyDbKeys.FINISHED_LOAD_IN_MAP, true);
     }

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

@@ -1,3 +1,8 @@
+/* Android IMSI-Catcher Detector | (c) AIMSICD Privacy Project
+ * -----------------------------------------------------------
+ * LICENSE:  http://git.io/vki47 | TERMS:  http://git.io/vki4o
+ * -----------------------------------------------------------
+ */
 package com.SecUpwN.AIMSICD.activities;
 
 import android.content.BroadcastReceiver;