From 9ffa08e3f52dfe58c96574226a7c3e6cad0ccf01 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Tue, 14 May 2019 15:28:52 -0700 Subject: [PATCH] 2.3.0 --- RELEASE_NOTES.md | 5 +++++ dependencies.gradle | 4 ++-- .../test/java/com/afollestad/assent/AssentInFragmentTest.kt | 6 +++--- .../afollestad/assent/rationale/MockShouldShowRationale.kt | 2 +- .../com/afollestad/assent/rationale/RationaleHandlerTest.kt | 6 ++++-- 5 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 RELEASE_NOTES.md diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md new file mode 100644 index 0000000..1882642 --- /dev/null +++ b/RELEASE_NOTES.md @@ -0,0 +1,5 @@ +2.3.0 + +* Rationale support! See the README. +* Bug fixes, of course. +* Dependency upgrades. \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index a03fb3e..62f57e5 100644 --- 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 index 6e20f33..f636764 100644 --- 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(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 { 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 index 0aad327..56c454c 100644 --- 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 index db00118..5b0dd17 100644 --- 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)