New version: 1.18.5

Javinator9889 · Jul 4, 2018 · 35c3ee2 · 35c3ee2
1 parent 2859125
commit 35c3ee2
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 .externalNativeBuild
 OLD_LICENSE.txt
 *.jks
+google-services.json
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,21 +3,34 @@ apply plugin: 'io.fabric'
 apply plugin: 'com.google.firebase.firebase-perf'
 
 android {
+    signingConfigs {
+        config {
+            keyAlias 'key0'
+            keyPassword 'dhc9Xe7XoidlRo77hohh'
+            storeFile file('E:/Nextcloud/AndroidApps/BitCoinPools/keyfile.jks')
+            storePassword 'dhc9Xe7XoidlRo77hohh'
+        }
+    }
     compileSdkVersion 27
     defaultConfig {
         applicationId "javinator9889.bitcoinpools"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 71
-        versionName "1.18.4"
+        versionCode 72
+        versionName "1.18.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             resValue "string", "app_version",
                     "${defaultConfig.versionName}"
+            debuggable false
+            jniDebuggable false
+            renderscriptDebuggable false
+            pseudoLocalesEnabled false
+            zipAlignEnabled true
         }
         debug {
             minifyEnabled false
@@ -59,6 +72,5 @@ dependencies {
     implementation 'com.android.support:cardview-v7:27.1.0'
     implementation 'com.jpardogo.materialtabstrip:library:1.1.1'
     implementation 'org.sufficientlysecure:donations:2.5'
-
 }
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
diff --git a/app/release/BitCoinPools-1.18.5.apk b/app/release/BitCoinPools-1.18.5.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":71,"versionName":"1.18.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":72,"versionName":"1.18.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/javinator9889/bitcoinpools/DataLoaderScreen.java b/app/src/main/java/javinator9889/bitcoinpools/DataLoaderScreen.java
@@ -125,20 +125,43 @@ protected void onPostExecute(Boolean result) {
                     Log.d(Constants.LOG.MATAG, Constants.LOG.CREATING_MAINVIEW);
                     new DataLoader().execute();
                 } else {
-                    new MaterialDialog.Builder(DataLoaderScreen.this)
-                            .title(R.string.noConnectionTitle)
-                            .content(R.string.noConnectionDesc)
-                            .cancelable(false)
-                            .positiveText(R.string.accept)
-                            .onPositive(new MaterialDialog.SingleButtonCallback() {
-                                @Override
-                                public void onClick(@NonNull MaterialDialog dialog,
-                                                    @NonNull DialogAction which) {
-                                    onBackPressed();
-                                }
-                            })
-                            .build()
-                            .show();
+                    try {
+                        new MaterialDialog.Builder(DataLoaderScreen.this)
+                                .title(R.string.noConnectionTitle)
+                                .content(R.string.noConnectionDesc)
+                                .cancelable(false)
+                                .positiveText(R.string.accept)
+                                .onPositive(new MaterialDialog.SingleButtonCallback() {
+                                    @Override
+                                    public void onClick(@NonNull MaterialDialog dialog,
+                                                        @NonNull DialogAction which) {
+                                        onBackPressed();
+                                    }
+                                })
+                                .build()
+                                .show();
+                    } catch (Exception e) {
+                        // MaterialDialog lib doesn't provide functionality to catch its own
+                        // exception
+                        // "DialogException" so we need to catch a global generally exception and
+                        // cancel
+                        // app execution. This happens because the application is trying to show
+                        // a dialog
+                        // after the app has been closed (there is no activity).
+                        Log.e("MaterialDialog",
+                                "Not possible to show dialog - maybe the app is" +
+                                " closed. Full trace: " + e.getMessage());
+                        try {
+                            DataLoaderScreen.this.finish();
+                        } catch (Exception activityFinishException) {
+                            // Maybe closing the activity when execution failed throws an exception
+                            // if there is no possibility to close it
+                            Log.e("FinishException",
+                                    "Impossible to finish the activity. Maybe it is finished" +
+                                            " yet. More info: "
+                                    + activityFinishException.getMessage());
+                        }
+                    }
                 }
                 Log.e("DataLoaderScreen", "An exception was thrown. Trying to obtain " +
                         "data again");

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -74,6 +74,9 @@
     <string name="github"><![CDATA[Accede al proyecto de GitHub justo aquí: <a href="https://github.com/Javinator9889/BitCoinPools">GitHub</a>]]></string>
     <string name="changelog">
         <![CDATA[
+        <h1>Versión 1.18.5 (04/07/18)</h1><i>
+        - Mantenimiento y corrección de errores<br />
+        - Tamaño de la aplicación reducido<br /></i>
         <h1>Versión 1.18.4 (09/06/18)</h1><i>
         - Correcciones menores de bugs y fallos<br /></i>
         <h1>Versión 1.18.3 (28/04/18)</h1><i>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -97,6 +97,9 @@ SOFTWARE.<br />
     <string name="github"><![CDATA[Access to the GitHub project right here: <a href="https://github.com/Javinator9889/BitCoinPools">GitHub</a>]]></string>
     <string name="changelog">
         <![CDATA[
+        <h1>Version 1.18.5 (04/07/18)</h1><i>
+        - Maintenance and bugs solved<br />
+        - Reduced app size<br /></i>
         <h1>Version 1.18.4 (09/06/18)</h1><i>
         - Minor bugs and issues corrections<br /></i>
         <h1>Version 1.18.3 (28/04/18)</h1><i>

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'io.fabric.tools:gradle:1.24.4'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'