Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 72166c6

Browse files
committed
treewide: use getSystemService extension everywhere
Signed-off-by: Harsh Shandilya <[email protected]>
1 parent d505151 commit 72166c6

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.appcompat.widget.SearchView.OnQueryTextListener
3030
import androidx.core.app.ActivityCompat
3131
import androidx.core.content.ContextCompat
3232
import androidx.core.content.edit
33+
import androidx.core.content.getSystemService
3334
import androidx.fragment.app.FragmentManager
3435
import androidx.lifecycle.ViewModelProvider
3536
import androidx.lifecycle.observe
@@ -102,7 +103,7 @@ class PasswordStore : AppCompatActivity() {
102103
activity = this
103104
settings = PreferenceManager.getDefaultSharedPreferences(this.applicationContext)
104105
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
105-
shortcutManager = getSystemService(ShortcutManager::class.java)
106+
shortcutManager = getSystemService()
106107
}
107108

108109
// If user opens app with permission granted then revokes and returns,

app/src/main/java/com/zeapo/pwdstore/UserPreference.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ class UserPreference : AppCompatActivity() {
578578

579579
private val isAccessibilityServiceEnabled: Boolean
580580
get() {
581-
val am = getSystemService(AccessibilityManager::class.java) ?: return false
581+
val am = getSystemService<AccessibilityManager>() ?: return false
582582
val runningServices = am
583583
.getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_GENERIC)
584584
return runningServices

app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import android.widget.TextView
3333
import androidx.appcompat.app.AppCompatActivity
3434
import androidx.constraintlayout.widget.ConstraintLayout
3535
import androidx.core.content.edit
36+
import androidx.core.content.getSystemService
3637
import androidx.core.widget.doOnTextChanged
3738
import androidx.lifecycle.lifecycleScope
3839
import androidx.localbroadcastmanager.content.LocalBroadcastManager
@@ -73,9 +74,7 @@ import org.openintents.openpgp.OpenPgpError
7374
import timber.log.Timber
7475

7576
class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
76-
private val clipboard: ClipboardManager by lazy {
77-
getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
78-
}
77+
private val clipboard by lazy { getSystemService<ClipboardManager>() }
7978
private var passwordEntry: PasswordEntry? = null
8079
private var api: OpenPgpApi? = null
8180

@@ -140,6 +139,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
140139
crypto_password_category_decrypt.text = relativeParentPath
141140
crypto_password_file.text = name
142141
crypto_password_file.setOnLongClickListener {
142+
val clipboard = clipboard ?: return@setOnLongClickListener false
143143
val clip = ClipData.newPlainText("pgp_handler_result_pm", name)
144144
clipboard.setPrimaryClip(clip)
145145
showSnackbar(this.resources.getString(R.string.clipboard_username_toast_text))
@@ -808,6 +808,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
808808
}
809809

810810
private fun copyPasswordToClipBoard() {
811+
val clipboard = clipboard ?: return
811812
var pass = passwordEntry?.password
812813

813814
if (findViewById<TextView>(R.id.crypto_password_show) == null) {
@@ -837,12 +838,14 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
837838
}
838839

839840
private fun copyUsernameToClipBoard(username: String) {
841+
val clipboard = clipboard ?: return
840842
val clip = ClipData.newPlainText("pgp_handler_result_pm", username)
841843
clipboard.setPrimaryClip(clip)
842844
showSnackbar(resources.getString(R.string.clipboard_username_toast_text))
843845
}
844846

845847
private fun copyOtpToClipBoard(code: String) {
848+
val clipboard = clipboard ?: return
846849
val clip = ClipData.newPlainText("pgp_handler_result_pm", code)
847850
clipboard.setPrimaryClip(clip)
848851
showSnackbar(resources.getString(R.string.clipboard_otp_toast_text))

app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import android.annotation.SuppressLint
88
import android.app.Dialog
99
import android.content.ClipData
1010
import android.content.ClipboardManager
11-
import android.content.Context
1211
import android.os.Bundle
1312
import android.view.View
1413
import android.widget.TextView
1514
import androidx.appcompat.app.AlertDialog
15+
import androidx.core.content.getSystemService
1616
import androidx.fragment.app.DialogFragment
1717
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1818
import com.zeapo.pwdstore.R
@@ -41,7 +41,7 @@ class ShowSshKeyFragment : DialogFragment() {
4141
ad.setOnShowListener {
4242
val b = ad.getButton(AlertDialog.BUTTON_NEUTRAL)
4343
b.setOnClickListener {
44-
val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
44+
val clipboard = activity.getSystemService<ClipboardManager>() ?: return@setOnClickListener
4545
val clip = ClipData.newPlainText("public key", publicKey.text.toString())
4646
clipboard.setPrimaryClip(clip)
4747
}

0 commit comments

Comments
 (0)