2.3.0

afollestad · May 14, 2019 · 9ffa08e · 9ffa08e
1 parent bed9166
commit 9ffa08e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -0,0 +1,5 @@
+2.3.0
+
+* Rationale support! See the README.
+* Bug fixes, of course.
+* Dependency upgrades.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,8 +2,8 @@ ext.versions = [
     minSdk             : 14,
     compileSdk         : 28,
     buildTools         : '28.0.3',
-    publishVersion     : '2.2.3',
-    publishVersionCode : 18,
+    publishVersion     : '2.3.0',
+    publishVersionCode : 19,
 
     gradlePlugin       : '3.4.0',
     spotlessPlugin     : '3.22.0',

diff --git a/library/src/test/java/com/afollestad/assent/AssentInFragmentTest.kt b/library/src/test/java/com/afollestad/assent/AssentInFragmentTest.kt
@@ -15,7 +15,6 @@
  */
 package com.afollestad.assent
 
-import android.content.pm.PackageManager
 import android.content.pm.PackageManager.PERMISSION_DENIED
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import androidx.fragment.app.Fragment
@@ -64,14 +63,15 @@ class AssentInFragmentTest {
       val checkPermission = inv.getArgument<String>(0)
       val parsedCheckPermission = Permission.parse(checkPermission)
       return@doAnswer if (allowedPermissions.contains(parsedCheckPermission)) {
-        PackageManager.PERMISSION_GRANTED
+        PERMISSION_GRANTED
       } else {
-        PackageManager.PERMISSION_DENIED
+        PERMISSION_DENIED
       }
     }
   }
   private val fragment = mock<Fragment> {
     on { fragmentManager } doReturn fragmentManager
+    on { childFragmentManager } doReturn fragmentManager
     on { activity } doReturn activity
   }
 

diff --git a/library/src/test/java/com/afollestad/assent/rationale/MockShouldShowRationale.kt b/library/src/test/java/com/afollestad/assent/rationale/MockShouldShowRationale.kt
@@ -50,7 +50,7 @@ class MockShouldShowRationale : ShouldShowRationale {
   fun handleShowRationale(
     permission: Permission,
     message: CharSequence,
-    onContinue: (Boolean) -> Unit
+    onContinue: ConfirmCallback
   ) {
     onContinue(shouldConfirm.contains(permission))
   }

diff --git a/library/src/test/java/com/afollestad/assent/rationale/RationaleHandlerTest.kt b/library/src/test/java/com/afollestad/assent/rationale/RationaleHandlerTest.kt
@@ -48,8 +48,10 @@ class RationaleHandlerTest {
     override fun showRationale(
       permission: Permission,
       message: CharSequence,
-      onContinue: (confirmed: Boolean) -> Unit
-    ) = shouldShow.handleShowRationale(permission, message, onContinue)
+      confirm: ConfirmCallback
+    ) = shouldShow.handleShowRationale(permission, message, confirm)
+
+    override fun onDestroy() = Unit
   }.apply {
     onPermission(READ_CONTACTS, CALL_PHONE_RATIONALE)
     onPermission(ACCESS_FINE_LOCATION, WRITE_STORAGE_RATIONALE)