From 276aa4ea7cec53d37dd4dc777119c3114535b628 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 9 Sep 2020 11:27:03 +0530 Subject: Fix directory selection in onboarding if storage permissions are granted (#1090) * OnboardingActivity: fix directory change option Add an else clause to cover the case when storage permission is granted already Signed-off-by: Harsh Shandilya * all: rename permission grant method The new name is a bit more explicit about its purpose Signed-off-by: Harsh Shandilya * UserPreference: add static method for external directory selection intent Signed-off-by: Harsh Shandilya --- .../java/com/zeapo/pwdstore/OnboardingActivity.kt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/OnboardingActivity.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/OnboardingActivity.kt b/app/src/main/java/com/zeapo/pwdstore/OnboardingActivity.kt index d26860dc..5e415766 100644 --- a/app/src/main/java/com/zeapo/pwdstore/OnboardingActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/OnboardingActivity.kt @@ -21,7 +21,7 @@ import com.zeapo.pwdstore.git.BaseGitActivity import com.zeapo.pwdstore.git.GitServerConfigActivity import com.zeapo.pwdstore.utils.PasswordRepository import com.zeapo.pwdstore.utils.PreferenceKeys -import com.zeapo.pwdstore.utils.checkRuntimePermission +import com.zeapo.pwdstore.utils.isPermissionGranted import com.zeapo.pwdstore.utils.getString import com.zeapo.pwdstore.utils.listFilesRecursively import com.zeapo.pwdstore.utils.sharedPrefs @@ -116,12 +116,10 @@ class OnboardingActivity : AppCompatActivity() { settings.edit { putBoolean(PreferenceKeys.GIT_EXTERNAL, true) } val externalRepo = settings.getString(PreferenceKeys.GIT_EXTERNAL_REPO) if (externalRepo == null) { - if (!checkRuntimePermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { registerForActivityResult(RequestPermission()) { granted -> if (granted) { - externalDirectorySelectAction.launch(Intent(this, UserPreference::class.java).apply { - putExtra("operation", "git_external") - }) + externalDirectorySelectAction.launch(UserPreference.createDirectorySelectionIntent(this)) } }.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE) } @@ -130,7 +128,7 @@ class OnboardingActivity : AppCompatActivity() { .setTitle(resources.getString(R.string.directory_selected_title)) .setMessage(resources.getString(R.string.directory_selected_message, externalRepo)) .setPositiveButton(resources.getString(R.string.use)) { _, _ -> - if (!checkRuntimePermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { registerForActivityResult(RequestPermission()) { granted -> if (granted) { initializeRepositoryInfo() @@ -141,14 +139,14 @@ class OnboardingActivity : AppCompatActivity() { } } .setNegativeButton(resources.getString(R.string.change)) { _, _ -> - if (!checkRuntimePermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { registerForActivityResult(RequestPermission()) { granted -> if (granted) { - repositoryInitAction.launch(Intent(this, UserPreference::class.java).apply { - putExtra("operation", "git_external") - }) + repositoryInitAction.launch(UserPreference.createDirectorySelectionIntent(this)) } }.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE) + } else { + repositoryInitAction.launch(UserPreference.createDirectorySelectionIntent(this)) } } .show() @@ -198,7 +196,7 @@ class OnboardingActivity : AppCompatActivity() { private fun initializeRepositoryInfo() { val externalRepo = settings.getBoolean(PreferenceKeys.GIT_EXTERNAL, false) val externalRepoPath = settings.getString(PreferenceKeys.GIT_EXTERNAL_REPO) - if (externalRepo && !checkRuntimePermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (externalRepo && !isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { return } if (externalRepo && externalRepoPath != null) { -- cgit v1.2.3