Merge pull request #7 from VenomVendor/release/v-2.0.0

Release/v 2.0.0 Fixes#5 Updated gradle to the latest Updated support versions. Bump version for next release. Updated Proguard rules. Fixes #5 In some devices android service was not starting, this was the reason behind app getting struck at 0/0 during deletion. Removed deletion in service & made it in async task. Added support for deleting multiple sms at once Update to Lambda expressions Removed unnecessary global variables. Added delay in showing sms switching dialog. Fixed formatting.
VenomVendor · Jul 22, 2017 · 130dbbc · 130dbbc
2 parents 1b95e9e + 4c25478
commit 130dbbc
Show file tree

Hide file tree

Showing 29 changed files with 819 additions and 531 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,26 +1,31 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    compileSdkVersion 26
+    buildToolsVersion '26.0.0'
 
     defaultConfig {
-        applicationId "com.venomvendor.sms.deduplicate"
+        applicationId 'com.venomvendor.sms.deduplicate'
         minSdkVersion 8
-        targetSdkVersion 24
+        targetSdkVersion 26
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-        jackOptions {
-            enabled rootProject.ext.enableJack
+        if (rootProject.ext.enableJack) {
+            jackOptions {
+                enabled false
+            }
         }
     }
 
+    flavorDimensions 'buildType'
     productFlavors {
         froyo {
+            dimension 'buildType'
             minSdkVersion 8
             versionCode rootProject.ext.froyo
         }
         donut {
+            dimension 'buildType'
             minSdkVersion 4
             maxSdkVersion 7
             targetSdkVersion 7
@@ -37,6 +42,7 @@ android {
                 storePassword KEYSTORE_PASSWORD
             }
             catch (ex) {
+                //noinspection GrUnresolvedAccess
                 throw new InvalidUserDataException("You should define KEY_ALIAS, KEY_PASSWORD & " +
                         "KEYSTORE_PASSWORD in gradle.properties. \n ${ex.getLocalizedMessage()}")
             }
@@ -53,14 +59,17 @@ android {
             minifyEnabled rootProject.ext.DEBUG
             signingConfig signingConfigs.release
             versionNameSuffix rootProject.ext.RELEASE_SUFFIX
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles './pro-guard/proguard-optimize.pro',
+                    './pro-guard/proguard-rules-aggressive.pro',
+                    './pro-guard/proguard-rules-consumer.pro',
+                    './pro-guard/proguard-rules-log.pro'
         }
         debug {
             debuggable rootProject.ext.DEBUG
             jniDebuggable rootProject.ext.DEBUG
             renderscriptDebuggable rootProject.ext.DEBUG
             pseudoLocalesEnabled rootProject.ext.DEBUG
-            shrinkResources rootProject.ext.DEBUG //Always True
+            shrinkResources !rootProject.ext.DEBUG
             minifyEnabled !rootProject.ext.DEBUG
             signingConfig signingConfigs.release
             versionNameSuffix rootProject.ext.DEBUG_SUFFIX
@@ -79,10 +88,11 @@ android {
     lintOptions {
         checkReleaseBuilds rootProject.ext.checkReleaseBuilds
         abortOnError rootProject.ext.abortOnError
+        disable 'IconMissingDensityFolder'
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
     }
 }
diff --git a/app/pro-guard/proguard-optimize.pro b/app/pro-guard/proguard-optimize.pro
@@ -0,0 +1,64 @@
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+-dontpreverify
+
+# The remainder of this file is identical to the non-optimized version
+# of the Proguard configuration file (except that the other file has
+# flags to turn off optimization).
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+-keepattributes *Annotation*
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# keep setters in Views so that animations can still work.
+# see http://proguard.sourceforge.net/manual/examples.html#beans
+-keepclassmembers public class * extends android.view.View {
+   void set*(***);
+   *** get*();
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator CREATOR;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
+# Understand the @Keep support annotation.
+-keep class android.support.annotation.Keep
+
+-keep @android.support.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+    @android.support.annotation.Keep <methods>;
+}
+
+-keepclasseswithmembers class * {
+    @android.support.annotation.Keep <fields>;
+}
+
+-keepclasseswithmembers class * {
+    @android.support.annotation.Keep <init>(...);
+}