Merge pull request #542 from SecUpwN/development

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

.travis.yml

@@ -76,5 +76,5 @@ addons:
 # Scan results: http://scan.coverity.com/projects/3346
     build_command_prepend: "./gradlew clean"
     build_command: "./gradlew build"
-    branch_pattern: development
+    branch_pattern: master
     build_script_url: https://spideroak.com/share/IFEU2U2JINCA/GitHub/home/SecUpwN/SpiderOak/MISC/external/travisci_build_coverity_scan.sh

CHANGELOG.md

@@ -1,11 +1,60 @@
 # CHANGELOG of 'AIMSICD'
 ----------------------
 
+#### [12.07.2015 - WIP-Release v0.1.32-alpha-build-00](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/releases/tag/v0.1.32-alpha-b00)
+
+* Updated: Enhanced `AIMSICD.java` for another attempt to fix AIMSICD not closing
+* Updated: French, Polish and Russian translations, added: Czech and Swedish
+* Updated: More updates of MWI detection strings with fixes to avoid failing build
+* Added: Small note in `CONTRIBUTING.md` to actually *finish* the started translations
+* Fixed: Reverted lacells pull request because it caused blockings and exceptions
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-05
+
+* Changed: Switched Coverity Scan analysis to `master` to avoid Travis-CI failures
+* Updated: Improved French, German and Polish translations (needs more translators)
+* Fixed: Corrected Type-0 silent SMS popup display and tried to fix app not closing
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-04
+
+* Updated: German translations have been improved upon changes in source strings
+* Fixed: Corrected MWI code and removed unnecessary spaces from detection popup
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-03
+
+* Updated: German translations have been improved upon changes in source strings
+* Removed: Purged E-Mail address to send logfiles to - a better way will come soon!
+* Removed: Purged invitation to send logfiles for every single detection event
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-02
+
+* Added: New table for detection tests of Type-0 silent SMS and MWI in [Special SMS](https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Special-SMS)
+* Fixed: Declared Message Waiting Indicator strings correctly in our detection code
+
+---
+
+#### 07.07.2015 - WIP-Internal v0.1.31-alpha-build-01
+
+* Updated: Enhanced Type-0 silent SMS detection with main buffer to logcat scraper
+* Updated: Translations via Weblate are now finally getting pulled in automatically
+* Updated: Thanked [thechangelog](https://github.com/thechangelog) in our `CREDITS` for their public announcements
+* Added: Translations into English, German, French, Polish, Japanese and Russian
+
+---
+
 #### [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`
+* Added: More clarifying code comments in `CellTracker.java`
 
 #### 05.07.2015 - WIP-Internal v0.1.30-alpha-build-16
 
@@ -27,7 +76,7 @@
 #### 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`
+* Fixed: Silenced some spammy XPrivacy items using `XPrivacy/XRuntime:S Xposed:S`
 
 ---
 
@@ -88,7 +137,7 @@
 
 #### 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
+* Added: Toasts are now being cancelled on new toast to prevent overlapping of toasts
 
 ---
 

CONTRIBUTING.md

@@ -25,6 +25,7 @@ Let our app start up in your native language!
 
 * 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.
+* Please make sure to finish all translations as best as possible.
 * Translations will be pulled into our GitHub automatically. Enjoy!
 
 ---

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="31"
-          android:versionName="0.1.31-alpha-b00">
+          android:versionCode="32"
+          android:versionName="0.1.32-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

@@ -227,4 +227,9 @@ Daniel Jäger\n
 https://github.com/DJaeger\n
 for your unbelievable endurance\n
 and all the lovely coding. THANK YOU!\n
-\n
+\n
+The Changelog\n
+https://changelog.com/\n
+for their podcast and tweet about us!\n
+(SPECIAL THANKS to Jerod)
+\n

app/src/main/assets/det_strings.json

@@ -4,7 +4,7 @@
 "detection_type":"TYPE0"},
 
 {"detection_string":"Received voice mail indicator clear SMS shouldStore=false",
-"detection_type":"SILENTVOICE"},
+"detection_type":"MWI"},
 
 {"detection_string":"SMS TP-PID:0 data coding scheme: 24",
 "detection_type":"FLASH"},

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

@@ -371,6 +371,15 @@ void selectItem(int position) {
             Intent i = new Intent(this, DebugLogs.class);
             startActivity(i);
         } else if (selectedItem.getId() == DrawerMenu.ID.APPLICATION.QUIT) {
+            try {
+                if(mAimsicdService.isSmsTracking()) {
+                    mAimsicdService.stopSmsTracking();
+                }
+            }catch (Exception ee) {
+                System.out.println("Error: Stopping SMS detection");
+            }
+
+            if (mAimsicdService != null) mAimsicdService.onDestroy();
             finish();
         }
 
@@ -566,7 +575,7 @@ public void onBackPressed() {
                 if(mAimsicdService.isSmsTracking()) {
                     mAimsicdService.stopSmsTracking();
                 }
-            }catch (Exception ee){System.out.println("Error Stopping sms detection");}
+            }catch (Exception ee){System.out.println("Error: Stopping SMS detection");}
             finish();
         }
     }
@@ -578,12 +587,12 @@ private void SmsDetection()
 
         if(root_sms && !mAimsicdService.isSmsTracking()){
             mAimsicdService.startSmsTracking();
-            Helpers.msgShort(mContext,"Sms Detection Started");
-            Log.i(TAG,"Sms Detection Thread Started");
+            Helpers.msgShort(mContext,"SMS Detection Started");
+            Log.i(TAG,"SMS Detection Thread Started");
         }else if(!root_sms && mAimsicdService.isSmsTracking()) {
             mAimsicdService.stopSmsTracking();
             Helpers.msgShort(mContext, "Sms Detection Stopped");
-            Log.i(TAG, "Sms Detection Thread Stopped");
+            Log.i(TAG, "SMS Detection Thread Stopped");
         }
 
     }

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

@@ -117,14 +117,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
             case 7:
                 MiscUtils.showNotification(getApplicationContext(),
-                        getResources().getString(R.string.alert_silent_voice_sms_detected),
-                        getResources().getString(R.string.app_name_short)+" - "+getResources().getString(R.string.typevoice_header),
+                        getResources().getString(R.string.alert_mwi_detected),
+                        getResources().getString(R.string.app_name_short)+" - "+getResources().getString(R.string.typemwi_header),
                         R.drawable.sense_danger,true);
 
                 createPopUp(
-                        getResources().getString(R.string.typevoice_title),
-                        getResources().getString(R.string.typevoice_header),
-                        getResources().getString(R.string.typevoice_data)
+                        getResources().getString(R.string.typemwi_title),
+                        getResources().getString(R.string.typemwi_header),
+                        getResources().getString(R.string.typemwi_data)
                         ,getResources().getDrawable(R.drawable.sense_danger));
                 break;
 
@@ -135,7 +135,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         R.drawable.sense_danger,true);
 
                 createPopUp(
-                        getResources().getString(R.string.typevoice_title),
+                        getResources().getString(R.string.typemwi_title),
                         getResources().getString(R.string.typewap_header),
                         getResources().getString(R.string.typewap_data)
                         ,getResources().getDrawable(R.drawable.sense_danger));

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

@@ -212,8 +212,8 @@ public void run() {
                     // show a share intent
                     Intent intent = new Intent(Intent.ACTION_SEND);
                     intent.setType("text/html");
-                    // This is a masked email to one of our developers. In case of spam re-mask.
-                    intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"SecUpwN[-AT-]protonmail.ch"});
+                    // E-Mail address will ONLY be handed out when a DEVELOPER asked for the logs!
+                    intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"See GitHub Issues first!"});
                     intent.putExtra(Intent.EXTRA_SUBJECT, "AIMSICD Error Log");
                     intent.putExtra(Intent.EXTRA_TEXT, log);
                     startActivity(Intent.createChooser(intent, "Send Error Log"));