Merge pull request #27 from percolate/fix_binderproxy_error

Check Activity state before displaying Dialogs
percolate · Nov 3, 2016 · 1355f17 · 1355f17
2 parents 4c85720 + aa23426
commit 1355f17
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/caffeine/build.gradle b/caffeine/build.gradle
@@ -7,7 +7,7 @@ version '1.0-SNAPSHOT'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "23.0.3"
+    buildToolsVersion = "24.0.3"
 
     buildTypes {
         debug {

diff --git a/caffeine/src/main/java/com/percolate/caffeine/DialogUtils.java b/caffeine/src/main/java/com/percolate/caffeine/DialogUtils.java
@@ -31,11 +31,13 @@ public static AlertDialog quickDialog(final Activity context, final String messa
         final SpannableString s = new SpannableString(message); //Make links clickable
         Linkify.addLinks(s, Linkify.ALL);
 
-        Builder builder = new AlertDialog.Builder(context);
+        final Builder builder = new AlertDialog.Builder(context);
         builder.setMessage(s);
         builder.setPositiveButton(android.R.string.ok, closeDialogListener());
         AlertDialog dialog = builder.create();
-        dialog.show();
+        if(!context.isFinishing()) {
+            dialog.show();
+        }
 
         ((TextView) dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance()); //Make links clickable
 

diff --git a/tests/build.gradle b/tests/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "23.0.3"
+    buildToolsVersion = "24.0.3"
 
     defaultConfig {
         applicationId "com.percolate.caffeine.testapp"