diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-04-21 13:11:27 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-04-21 15:55:25 +0530 |
| commit | d505151662da1c9a9d9ce5434db2a370d4167e36 (patch) | |
| tree | e0a3fdafc56c07dba5980ae92b1a76477992f97b /app/src/main/java/com/zeapo/pwdstore/git | |
| parent | e1921b26e0fdc9d4fdb9df2f31278aba051edf0f (diff) | |
| download | HardenedPass-d505151662da1c9a9d9ce5434db2a370d4167e36.tar.gz HardenedPass-d505151662da1c9a9d9ce5434db2a370d4167e36.zip | |
treewide: use edit extension and cleanup some deprecation
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt | 13 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt index 8a05ca40..8ad19618 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt @@ -6,6 +6,7 @@ package com.zeapo.pwdstore.git import android.os.Bundle import android.util.Patterns +import androidx.core.content.edit import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.zeapo.pwdstore.R import com.zeapo.pwdstore.databinding.ActivityGitConfigBinding @@ -50,12 +51,12 @@ class GitConfigActivity : BaseGitActivity() { .setPositiveButton(getString(R.string.dialog_ok), null) .show() } else { - val editor = settings.edit() - editor.putString("git_config_user_email", email) - editor.putString("git_config_user_name", name) - PasswordRepository.setUserName(name) - PasswordRepository.setUserEmail(email) - editor.apply() + settings.edit { + putString("git_config_user_email", email) + putString("git_config_user_name", name) + } + PasswordRepository.setUserName(name) + PasswordRepository.setUserEmail(email) } } } diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt index e115c482..817d9dca 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt @@ -189,7 +189,7 @@ abstract class GitOperation(fileDir: File, internal val callingActivity: Activit // Authenticate using the ssh-key and then execute the command setAuthentication(sshKey, username, passphrase.text.toString()).execute() } else { - encryptedSettings.edit().putString("ssh_key_local_passphrase", null).apply() + encryptedSettings.edit { putString("ssh_key_local_passphrase", null) } // call back the method executeAfterAuthentication(connectionMode, username, sshKey, identity, true) } |