diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2022-05-28 01:48:39 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-27 20:18:39 +0000 |
| commit | 184391599b3b2946a485fc31e3b6896d2ab6f303 (patch) | |
| tree | 50663ba3b5c3fb43383b864b90e38e364d15cdfa /app/src/main/java/dev/msfjarvis/aps/ui/crypto | |
| parent | fb7c81124cce8f89aeaa282ecdfdcdc65c460acd (diff) | |
| download | HardenedPass-184391599b3b2946a485fc31e3b6896d2ab6f303.tar.gz HardenedPass-184391599b3b2946a485fc31e3b6896d2ab6f303.zip | |
Fix ClipboardService crash (#1928)
* Fix clipboard service crash on API 31
* all: use ints directly for SDK version checks
I much prefer it this way
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/crypto')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt index 6ce1c057..758a927d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt @@ -239,7 +239,7 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou action = ClipboardService.ACTION_START putExtra(ClipboardService.EXTRA_NOTIFICATION_TIME, clearAfter) } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (Build.VERSION.SDK_INT >= 26) { startForegroundService(service) } else { startService(service) diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt index 7a9ba54e..113c3bb6 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt @@ -129,7 +129,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB return@registerForActivityResult } val bitmap = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + if (Build.VERSION.SDK_INT >= 28) { ImageDecoder.decodeBitmap(ImageDecoder.createSource(contentResolver, imageUri)) .copy(Bitmap.Config.ARGB_8888, true) } else { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt index a35891a5..b435b6e7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt @@ -105,7 +105,7 @@ class PasswordCreationActivityV2 : BasePgpActivity() { return@registerForActivityResult } val bitmap = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + if (Build.VERSION.SDK_INT >= 28) { ImageDecoder.decodeBitmap(ImageDecoder.createSource(contentResolver, imageUri)) .copy(Bitmap.Config.ARGB_8888, true) } else { |