Merge pull request #770 from SecUpwN/development

Unchaining WIP-Release v0.1.39.1-alpha
CellularPrivacy · Feb 16, 2016 · e1dd2cc · e1dd2cc
2 parents be335f0 + a8d53c9
commit e1dd2cc
Show file tree

Hide file tree

Showing 38 changed files with 792 additions and 728 deletions.
diff --git a/AIMSICD/build.gradle b/AIMSICD/build.gradle
@@ -17,21 +17,12 @@ if (isTravis) {
     buildNumber = System.getenv("BUILDOZER_BUILDNUMBER")
 }
 
-version = '0.1.39-alpha'
+version = '0.1.39.1-alpha'
 
 android {
     compileSdkVersion 23
     buildToolsVersion '23.0.2'
 
-    signingConfigs {
-        releaseSigningConfig {
-            keyAlias project.hasProperty("aimsicd_key_alias") ? aimsicd_key_alias : "dummy"
-            keyPassword project.hasProperty("aimsicd_key_password") ? aimsicd_key_password : "dummy"
-            storeFile file('../keystore.jks')
-            storePassword project.hasProperty("aimsicd_keystore_password") ? aimsicd_keystore_password : "dummy"
-        }
-    }
-
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 19 // Do not change: Working Icons on Android 5+
@@ -54,7 +45,6 @@ android {
             buildConfigField 'String', 'OPEN_CELLID_API_KEY', '"NA"'
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            signingConfig file('../keystore.jks').exists() ? signingConfigs.releaseSigningConfig : null
         }
     }
     compileOptions {
@@ -113,5 +103,9 @@ dependencies {
     //compile 'com.github.amlcurran.showcaseview:library:5.3.0'
 }
 
-
+apply from: "signing.gradle"
 apply plugin: "io.freefair.android-checkstyle"
+
+checkstyle {
+    toolVersion = "6.15"
+}
diff --git a/AIMSICD/config/checkstyle/checkstyle.xml b/AIMSICD/config/checkstyle/checkstyle.xml
@@ -7,7 +7,7 @@
     <module name="FileLength">
         <property name="max" value="2500" />
     </module>
-    <!--module name="FileTabCharacter"/-->
+    <module name="FileTabCharacter" />
 
     <!-- Name Checks -->
     <module name="TreeWalker">
@@ -26,37 +26,56 @@
 
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport" /><!-- defaults to sun.* packages -->
+        <module name="AvoidStarImport" />
+        <module name="IllegalImport" />
+        <!-- defaults to sun.* packages -->
         <module name="RedundantImport" />
         <module name="UnusedImports">
             <property name="processJavadoc" value="true" />
         </module>
 
+        <module name="MissingDeprecated" />
+
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->
         <module name="ModifierOrder" />
         <module name="RedundantModifier" />
 
         <module name="CovariantEquals" />
         <module name="EmptyStatement" />
-
-
+        <module name="OneStatementPerLine" />
+        <module name="InnerAssignment" />
         <module name="IllegalInstantiation">
-            <property name="classes" value="java.util.Vector"/>
-            <property name="classes" value="java.util.Hashtable"/>
+            <property name="classes" value="java.util.Vector" />
+            <property name="classes" value="java.util.Hashtable" />
         </module>
         <module name="IllegalType">
-            <property name="illegalClassNames" value="java.util.Vector"/>
-            <property name="illegalClassNames" value="java.util.Hashtable"/>
-            <property name="illegalClassNames" value="java.util.ArrayList"/>
-            <property name="illegalClassNames" value="java.util.LinkedList"/>
-            <property name="illegalClassNames" value="android.util.Log"/>
+            <property name="illegalClassNames" value="java.util.Vector" />
+            <property name="illegalClassNames" value="java.util.Hashtable" />
+            <property name="illegalClassNames" value="java.util.ArrayList" />
+            <property name="illegalClassNames" value="java.util.LinkedList" />
+            <property name="illegalClassNames" value="android.util.Log" />
+        </module>
+        <module name="MissingSwitchDefault">
+            <property name="severity" value="warning" />
         </module>
-
-        <!--module name="MissingSwitchDefault"/-->
-        <!--module name="RedundantThrows"/-->
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
+
+        <!-- Code style -->
+        <module name="AvoidNestedBlocks">
+            <property name="allowInSwitchCase" value="true" />
+        </module>
+        <module name="EmptyBlock" />
+        <module name="LeftCurly" />
+        <module name="NeedBraces" />
+        <module name="RightCurly" />
+
+        <module name="EmptyForInitializerPad" />
+        <module name="EmptyForIteratorPad" />
+        <module name="GenericWhitespace" />
+        <module name="MethodParamPad" />
+        <module name="NoLineWrap" />
+        <module name="NoWhitespaceAfter" />
     </module>
 </module>
diff --git a/AIMSICD/signing.gradle b/AIMSICD/signing.gradle
@@ -0,0 +1,20 @@
+if (project.hasProperty("aimsicd_key_alias")
+        && project.hasProperty("aimsicd_key_password")
+        && project.hasProperty("aimsicd_keystore_password")
+        && file('../keystore.jks').exists()) {
+    android {
+        signingConfigs {
+            releaseSigningConfig {
+                keyAlias project.hasProperty("aimsicd_key_alias") ? aimsicd_key_alias : "dummy"
+                keyPassword ? aimsicd_key_password : "dummy"
+                storeFile file('../keystore.jks')
+                storePassword project.hasProperty("aimsicd_keystore_password") ? aimsicd_keystore_password : "dummy"
+            }
+        }
+        buildTypes {
+            release {
+                signingConfig signingConfigs.releaseSigningConfig
+            }
+        }
+    }
+}
diff --git a/AIMSICD/src/main/assets/CREDITS b/AIMSICD/src/main/assets/CREDITS