rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash during clean clipboard in Android 9

Browse Source
This commit is contained in:
J-Jamet
2019-12-21 21:31:12 +01:00
parent 76050a261b
commit 2f5b322fad
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
View File

@@ -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, "")
}