Merge pull request #736 from SecUpwN/development

Unchaining WIP-Release v0.1.38-alpha
CellularPrivacy · Dec 31, 2015 · acc45c7 · acc45c7
2 parents bf2cd64 + ff637ce
commit acc45c7
Show file tree

Hide file tree

Showing 101 changed files with 1,594 additions and 5,376 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,8 +30,8 @@ android:
      - platform-tools
      - tools
 # The BuildTools version we are using for our project
-     - build-tools-22.0.1
-     - android-22
+     - build-tools-23.0.2
+     - android-23
 # Additional components
      - extra-android-m2repository
 

diff --git a/AIMSICD/build.gradle b/AIMSICD/build.gradle
@@ -1,10 +1,11 @@
+apply plugin: 'checkstyle'
 apply plugin: 'com.android.application'
 
-def gitSha = 'na'
+def gitSha = null
 try {
     gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
 } catch (Exception e) {
-    logger.warn("git not available")
+    logger.warn("git not available", e)
 }
 
 def isCi = "true".equals(System.getenv("CI"))
@@ -17,18 +18,19 @@ if(isTravis) {
     buildNumber = System.getenv("BUILDOZER_BUILDNUMBER")
 }
 
+version = '0.1.38-alpha'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 19 // Do not change: Working Icons on Android 5+
-        versionCode 37
-        versionName '0.1.37-alpha'
+        versionCode 38
         testApplicationId "com.SecUpwN.AIMSICD.test"
 
         buildConfigField 'String', 'BUILD_NUMBER', (buildNumber == null ? 'null' : "\"${buildNumber}\"")
+        buildConfigField 'String', 'GIT_SHA', (gitSha == null ? 'null' : "\"${gitSha}\"")
     }
     buildTypes {
         debug {
@@ -37,18 +39,12 @@ android {
             } catch (MissingPropertyException e) {
                 buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
             }
-            if (!gitSha.equals('na')) {
-                versionNameSuffix '-' + gitSha
-            } else {
-                versionNameSuffix '-debug'
-            }
+            versionNameSuffix '-debug'
         }
         release {
             buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-
-            versionNameSuffix '-release'
         }
     }
     compileOptions {
@@ -71,26 +67,55 @@ android {
     }
 
     productFlavors {
-        system {}
-        normal {}
+        system {
+            versionName "$project.version-system"
+        }
+        normal {
+            versionName "$project.version-normal"
+        }
     }
 }
 
 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.2.1'
-    //https://github.com/lp0/slf4j-android
-    compile project(':third_party:rootshell')
-    compile 'org.slf4j:slf4j-api:1.7.12'
-    compile 'eu.lp0.slf4j:slf4j-android:1.7.12-0'
-    compile 'com.squareup.okhttp:okhttp:2.6.0'
+    // Please group dependencies for better review like below.
+
+    // Android Support Libraries
+    compile 'com.android.support:appcompat-v7:23.1.1'
+
+    // OpenCSV (comma-separated values) parser library
     compile 'au.com.bytecode:opencsv:2.4'
+
+    // Easy to use Root Shell for Android Applications
+    compile 'com.github.Stericson:RootShell:d708ae1f0a'
+
+    // SLF4J binding for the Android logger
+    // https://github.com/lp0/slf4j-android
+    compile 'eu.lp0.slf4j:slf4j-android:1.7.12-0'
+    compile 'org.slf4j:slf4j-api:1.7.12'
+
+    // Dependency Injection for Android
+    compile 'io.freefair.android-injection:injection:1.0.0-rc2'
+    compile 'io.freefair.android-injection:logging:1.0.0-rc2'
+    compile 'io.freefair.android-injection:okhttp:1.0.0-rc2'
 
-    //This git hash resolves to version 5.5
-    compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:2e8bca20f7'
+    // OSMBonusPack library to interact with OpenStreetMap data
+    compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:v5.6'
+
+    // Transition library for animated transition effects
     compile 'com.github.kaichunlin.transition:core:0.9.2'
-    compile 'io.freefair.android-util:logging:1.1.0'
-    //debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
-    //releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
+
+    // ShowcaseView library to highlight specific app elements
+    //compile 'com.github.amlcurran.showcaseview:library:5.3.0'
+}
+
+check.dependsOn 'checkstyle'
+
+task checkstyle(type: Checkstyle) {
+    source 'src'
+    include '**/*.java'
+
+
+
+    classpath = files()
 }
diff --git a/AIMSICD/config/checkstyle/checkstyle.xml b/AIMSICD/config/checkstyle/checkstyle.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+    <!--module name="NewlineAtEndOfFile"/-->
+    <module name="FileLength">
+        <property name="max" value="2500"/>
+    </module>
+    <!--module name="FileTabCharacter"/-->
+
+    <module name="TreeWalker">
+
+        <!--module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/-->
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports">
+            <property name="processJavadoc" value="true"/>
+        </module>
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+        <module name="CovariantEquals"/>
+        <module name="EmptyStatement"/>
+
+
+        <module name="IllegalInstantiation"/>
+
+        <!--module name="MissingSwitchDefault"/-->
+        <!--module name="RedundantThrows"/-->
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+    </module>
+</module>
diff --git a/AIMSICD/proguard-rules.txt b/AIMSICD/proguard-rules.txt
@@ -1,10 +1,10 @@
+-dontobfuscate
 -verbose
 -optimizationpasses 5
 -dontpreverify
 -dump class_files.txt
 -printseeds seeds.txt
 -printusage unused.txt
--printmapping mapping.txt
 
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable

diff --git a/AIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/Detection1.java b/AIMSICD/src/androidTest/java/com/SecUpwN/AIMSICD/test/Detection1.java
diff --git a/AIMSICD/src/main/AndroidManifest.xml b/AIMSICD/src/main/AndroidManifest.xml
@@ -1,55 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.SecUpwN.AIMSICD">
-
-    <!-- If we ever wanna make this a system app, we can add the following 2 lines above:
-          coreApp="true"
-          android:sharedUserId="android.uid.system"> -->
+    package="com.SecUpwN.AIMSICD"
+    tools:ignore="GoogleAppIndexingWarning">
 
-    <!-- PERMISSIONS ARE SORTED BY AOS PERMISSION AND 3rd PARTY ACCESS. KEEP THIS! -->
-    <!-- https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Permissions -->
+    <!--
+        Privacy Enthusiasts: Please read our Permissions Statement linked below!
+        https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/wiki/Permissions
+    -->
 
-    <!-- Normal Android third-party permissions -->
-    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
+    <!-- Normal Android third-party permissions, sorted for better viewing -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <!-- SPECIAL PERMISSIONS TO BE ADDED AFTER THIS LINE. /> -->
-    <!-- To list all available (used) Android permissions on a device, use:
-         # `pm list permissions -g`  -->
-
-    <!-- These are OEM / Samsung Permissions -->
-    <uses-permission android:name="android.phone.receiveDetailedCallState"/>
-    <uses-permission android:name="com.android.permission.HANDOVER_STATUS"/>
-    <uses-permission android:name="com.sec.android.app.controlpanel.permission.PRIVATE"/>
-    <uses-permission android:name="com.sec.android.app.factorymode.permission.KEYSTRING"/>
-    <uses-permission android:name="com.sec.android.app.cm.permission.PERMISSION_MANAGEMENT"/>
-    <uses-permission android:name="com.sec.android.app.phoneutil.permission.KEYSTRING"/>
-    <uses-permission android:name="com.sec.android.app.servicemodeapp.permission.KEYSTRING"/>
-    <uses-permission android:name="com.sec.android.phone.permission.DATA_ROAMING_SETTINGS_ENHANCED"/>
-    <uses-permission android:name="com.sec.android.phone.permission.READ_CALL_SETTINGS"/>
-    <uses-permission android:name="com.sec.android.phone.permission.WRITE_CALL_SETTINGS"/>
-    <!-- uses-permission android:name="com.sec.factory.permission.ALLOWFTCLIENTCPOBIND"/>
-    <uses-permission android:name="com.sec.factory.permission.BT_ID_WRITE"/ -->
-    <uses-permission android:name="com.sec.factory.permission.KEYSTRING"/>
-    <uses-permission android:name="com.sec.modem.settings.permission.KEYSTRING"/>
-    <!-- uses-permission android:name="diagandroid.app.receiveDetailedApplicationState"/>
-    <uses-permission android:name="diagandroid.data.receivePDPContextState"/>
-    <uses-permission android:name="diagandroid.phone.receiveDetailedCallState"/ -->
-
-    <!-- May be needed (in the future) to access SIM related functions -->
-    <uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD"/>
-
+
+    <!--
+        May be needed (in the future) to access SIM related functions
+        <uses-permission android:name="org.simalliance.openmobileapi.SMARTCARD"/>
+    -->
+
     <application
             tools:replace="allowBackup"
             android:allowBackup="false"
@@ -100,11 +83,20 @@
             android:name=".activities.OpenCellIdActivity"
             android:icon="@drawable/ic_action_settings"
             android:label="@string/title_ocid_key"
-            android:theme="@android:style/Theme.Holo.Dialog"
             android:parentActivityName=".activities.PrefActivity"
             android:configChanges="keyboardHidden|screenLayout|screenSize|orientation">
         </activity>
 
+        <activity
+            android:name=".activities.AboutActivity"
+            android:label="@string/about_aimsicd"
+            android:parentActivityName=".AIMSICD">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.INFO"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".activities.DebugLogs"
             android:icon="@drawable/ic_action_settings"
@@ -137,10 +129,6 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name=".activities.CreditsRollActivity"
-            android:theme="@android:style/Theme.Dialog"
-            android:screenOrientation="portrait"> </activity>
-
         <activity
             android:name=".smsdetection.AdvancedUserActivity"
             android:label="@string/title_activity_advanced_user" >

diff --git a/AIMSICD/src/main/assets/CREDITS b/AIMSICD/src/main/assets/CREDITS
@@ -1,20 +1,12 @@
-### .:: C R E D I T S ::. ###\n
-\n
-of the\n
-\n
 ANDROID IMSI-CATCHER DETECTOR\n
 [born in 2012 on XDA-Developers]\n
-https://is.gd/AIMSICD\n
-\n
-~*********************~\n
+Website: https://git.io/AIMSICD\n
 \n
 This list is in no particular order.\n
 If I forgot YOU, please drop me a hint.\n
 \n
 THANK YOU EVERYONE! ;-)\n
 \n
-~*********************~\n
-\n
 E:V:A\n
 for creating this AWESOME project! <3\n
 unfortunately he left this project.\n