From 2f5b322faddeedf2d9793344585a3b5bf205b428 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 21 Dec 2019 21:31:12 +0100 Subject: [PATCH 1/3] Fix crash during clean clipboard in Android 9 --- .../com/kunzisoft/keepass/timeout/ClipboardHelper.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt index 1697c8e77..b52a46f7b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt @@ -37,8 +37,8 @@ import java.util.* class ClipboardHelper(private val context: Context) { - private val clipboardManager: ClipboardManager = - context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + private val clipboardManager: ClipboardManager? = + context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager? private val mTimer = Timer() @JvmOverloads @@ -64,7 +64,7 @@ class ClipboardHelper(private val context: Context) { } fun getClipboard(context: Context): CharSequence { - if (clipboardManager.hasPrimaryClip()) { + if (clipboardManager?.hasPrimaryClip() == true) { val data = clipboardManager.primaryClip if (data!!.itemCount > 0) { val text = data.getItemAt(0).coerceToText(context) @@ -84,7 +84,7 @@ class ClipboardHelper(private val context: Context) { @Throws(ClipboardException::class) fun copyToClipboard(label: String, value: String) { try { - clipboardManager.primaryClip = ClipData.newPlainText(label, value) + clipboardManager?.primaryClip = ClipData.newPlainText(label, value) } catch (e: Exception) { throw ClipboardException(e) } @@ -95,7 +95,7 @@ class ClipboardHelper(private val context: Context) { @JvmOverloads fun cleanClipboard(label: String = "") { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - clipboardManager.clearPrimaryClip() + clipboardManager?.clearPrimaryClip() } else { copyToClipboard(label, "") } From a378810f88260345cfdf5a78e36384a90010a64f Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 21 Dec 2019 21:36:33 +0100 Subject: [PATCH 2/3] Improvement code for ClipboardHelper --- .../keepass/timeout/ClipboardHelper.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt index b52a46f7b..88f3cfdc2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt +++ b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt @@ -37,10 +37,16 @@ import java.util.* class ClipboardHelper(private val context: Context) { - private val clipboardManager: ClipboardManager? = - context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager? + private var mClipboardManager: ClipboardManager? = null + private val mTimer = Timer() + private fun getClipboardManager(): ClipboardManager? { + if (mClipboardManager == null) + mClipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager? + return mClipboardManager + } + @JvmOverloads fun timeoutCopyToClipboard(text: String, toastString: String = "") { if (toastString.isNotEmpty()) @@ -64,8 +70,8 @@ class ClipboardHelper(private val context: Context) { } fun getClipboard(context: Context): CharSequence { - if (clipboardManager?.hasPrimaryClip() == true) { - val data = clipboardManager.primaryClip + if (getClipboardManager()?.hasPrimaryClip() == true) { + val data = getClipboardManager()?.primaryClip if (data!!.itemCount > 0) { val text = data.getItemAt(0).coerceToText(context) if (text != null) { @@ -84,7 +90,7 @@ class ClipboardHelper(private val context: Context) { @Throws(ClipboardException::class) fun copyToClipboard(label: String, value: String) { try { - clipboardManager?.primaryClip = ClipData.newPlainText(label, value) + getClipboardManager()?.primaryClip = ClipData.newPlainText(label, value) } catch (e: Exception) { throw ClipboardException(e) } @@ -95,7 +101,7 @@ class ClipboardHelper(private val context: Context) { @JvmOverloads fun cleanClipboard(label: String = "") { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - clipboardManager?.clearPrimaryClip() + getClipboardManager()?.clearPrimaryClip() } else { copyToClipboard(label, "") } From fc7b183461f4524244a94e442ba3d8322762b10c Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sun, 22 Dec 2019 17:51:48 +0100 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG | 3 +++ fastlane/metadata/android/en-US/changelogs/26.txt | 1 + fastlane/metadata/android/fr-FR/changelogs/26.txt | 1 + 3 files changed, 5 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/26.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/26.txt diff --git a/CHANGELOG b/CHANGELOG index b1d2b6707..b43c635b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +KeepassDX (2.5.0.0beta26) + * Fix crash when clearing clipboard + KeepassDX (2.5.0.0beta25) * Setting for Recycle Bin * Fix Recycle bin issues diff --git a/fastlane/metadata/android/en-US/changelogs/26.txt b/fastlane/metadata/android/en-US/changelogs/26.txt new file mode 100644 index 000000000..53e718b20 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/26.txt @@ -0,0 +1 @@ + * Fix crash when clearing clipboard \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/26.txt b/fastlane/metadata/android/fr-FR/changelogs/26.txt new file mode 100644 index 000000000..68a1e7fef --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/26.txt @@ -0,0 +1 @@ + * Correction du crash pendant le vidage du presse-papiers \ No newline at end of file