Merge pull request #779 from SecUpwN/development

Unchaining WIP-Release v0.1.40-alpha
CellularPrivacy · Feb 21, 2016 · f3fd81c · f3fd81c
2 parents e1dd2cc + 599859d
commit f3fd81c
Show file tree

Hide file tree

Showing 41 changed files with 1,444 additions and 587 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,4 @@ signing.properties
 import-summary.txt
 manifest-merger*.txt
 .navigation/
+scratchpad
diff --git a/AIMSICD/build.gradle b/AIMSICD/build.gradle
@@ -8,16 +8,6 @@ try {
 }
 
 def isCi = "true".equals(System.getenv("CI"))
-def isTravis = "true".equals(System.getenv("TRAVIS"))
-
-def buildNumber = null
-if (isTravis) {
-    buildNumber = System.getenv("TRAVIS_BUILD_NUMBER")
-} else {
-    buildNumber = System.getenv("BUILDOZER_BUILDNUMBER")
-}
-
-version = '0.1.39.1-alpha'
 
 android {
     compileSdkVersion 23
@@ -26,10 +16,10 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 19 // Do not change: Working Icons on Android 5+
-        versionCode 39
+        versionCode 40
         testApplicationId "com.SecUpwN.AIMSICD.test"
 
-        buildConfigField 'String', 'BUILD_NUMBER', (buildNumber == null ? 'null' : "\"${buildNumber}\"")
+        buildConfigField 'String', 'BUILD_NUMBER', (getBuildNumber() == null ? 'null' : "\"${buildNumber}\"")
         buildConfigField 'String', 'GIT_SHA', (gitSha == null ? 'null' : "\"${gitSha}\"")
     }
     buildTypes {
@@ -52,7 +42,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
     lintOptions {
-        warning 'MissingTranslation', 'InvalidPackage'
+        warning 'MissingTranslation', 'InvalidPackage', 'MissingRegistered'
         abortOnError false
 
         xmlReport false
@@ -109,3 +99,17 @@ apply plugin: "io.freefair.android-checkstyle"
 checkstyle {
     toolVersion = "6.15"
 }
+
+String getBuildNumber() {
+    String travisBuildNumber = System.getenv("TRAVIS_BUILD_NUMBER")
+    if(travisBuildNumber != null) {
+        return "T-$travisBuildNumber"
+    }
+
+    String buildozerBuildNumber = System.getenv("BUILDOZER_BUILDNUMBER")
+    if(buildozerBuildNumber != null) {
+        return "B-$buildozerBuildNumber"
+    }
+
+    return null;
+}
diff --git a/AIMSICD/src/main/AndroidManifest.xml b/AIMSICD/src/main/AndroidManifest.xml
@@ -56,19 +56,7 @@
         </activity>
 
         <activity
-                android:name=".activities.MapViewerOsmDroid"
-                android:exported="true"
-                android:label="@string/map_view"
-                android:parentActivityName=".AIMSICD"
-                android:launchMode="singleInstance"
-                android:configChanges="keyboardHidden|screenLayout|screenSize|orientation">
-            <meta-data
-                    android:name="android.support.PARENT_ACTIVITY"
-                    android:value=".AIMSICD"/>
-        </activity>
-
-        <activity
-                android:name=".activities.PrefActivity"
+                android:name=".activities.SettingsActivity"
                 android:exported="true"
                 android:icon="@drawable/ic_action_settings"
                 android:label="@string/preferences"
@@ -83,7 +71,7 @@
             android:name=".activities.OpenCellIdActivity"
             android:icon="@drawable/ic_action_settings"
             android:label="@string/title_ocid_key"
-            android:parentActivityName=".activities.PrefActivity"
+            android:parentActivityName=".activities.SettingsActivity"
             android:configChanges="keyboardHidden|screenLayout|screenSize|orientation">
         </activity>
 
@@ -97,11 +85,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".activities.AtCommandActivity"
-            android:label="@string/at_command_title"
-            android:parentActivityName=".AIMSICD" />
-
         <activity
             android:name=".activities.DebugLogs"
             android:icon="@drawable/ic_action_settings"