0.2.5

afollestad · Aug 17, 2016 · 896bf2d · 896bf2d
1 parent 7afd56f
commit 896bf2d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Add this to your module's `build.gradle` file:
 ```gradle
 dependencies {
     // ... other dependencies
-    compile 'com.afollestad:assent:0.2.4'
+    compile 'com.afollestad:assent:0.2.5'
 }
 ```
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'com.afollestad'
     PUBLISH_ARTIFACT_ID = 'assent'
-    PUBLISH_VERSION = '0.2.4'
+    PUBLISH_VERSION = '0.2.5'
     TARGET_SDK = 24
     BUILD_TOOLS = "24.0.0"
-    GOOGLE_LIBS = "24.0.0"
+    GOOGLE_LIBS = "24.2.0"
 }
 
 android {

diff --git a/library/src/main/java/com/afollestad/assent/Assent.java b/library/src/main/java/com/afollestad/assent/Assent.java
@@ -44,6 +44,7 @@ public static void setFragment(@Nullable android.app.Fragment from, @Nullable an
         } else {
             instance().mAppFragment = context;
             instance().mSupportFragment = null;
+            instance().mActivity = null;
         }
     }
 
@@ -57,6 +58,7 @@ public static void setFragment(@Nullable android.support.v4.app.Fragment from, @
         } else {
             instance().mAppFragment = null;
             instance().mSupportFragment = context;
+            instance().mActivity = null;
         }
     }
 
@@ -69,6 +71,8 @@ public static void setActivity(@NonNull Activity from, @Nullable Activity contex
                 instance().mSupportFragment = null;
             }
         } else {
+            instance().mAppFragment = null;
+            instance().mSupportFragment = null;
             instance().mActivity = context;
         }
     }

diff --git a/library/src/main/java/com/afollestad/assent/AssentBase.java b/library/src/main/java/com/afollestad/assent/AssentBase.java
@@ -10,6 +10,8 @@
  */
 class AssentBase {
 
+    public static boolean LOGGING_ENABLED = false;
+
     @NonNull
     protected static String getCacheKey(@NonNull String... permissions) {
         StringBuilder result = new StringBuilder();
@@ -49,7 +51,7 @@ protected static String join(String[] array) {
     }
 
     protected static void LOG(@NonNull String tag, @NonNull String message, @Nullable Object... args) {
-        if (!BuildConfig.DEBUG) return;
+        if (!LOGGING_ENABLED) return;
         if (args != null)
             Log.d(tag, String.format(message, args));
         else

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.application'
 
 ext {
-    PUBLISH_VERSION = "0.2.4"
+    PUBLISH_VERSION = "0.2.5"
     TARGET_SDK = 24
     BUILD_TOOLS = "24.0.0"
-    GOOGLE_LIBS = "24.0.0"
+    GOOGLE_LIBS = "24.2.0"
 }
 
 android {
@@ -15,7 +15,7 @@ android {
         applicationId "com.afollestad.assentsample"
         minSdkVersion 14
         targetSdkVersion TARGET_SDK
-        versionCode 8
+        versionCode 9
         versionName PUBLISH_VERSION
     }
     lintOptions {