mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-09-05 00:35:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better detect uninitialized repositories and offer to clone (#738)

Browse Source 
* PasswordRepository: more comprehensive check for valid repository

* PasswordFragment: Give 'repo uninitialized' Snackbar some purpose in life

* GitOperationActivity: finish immediately when an unhandled request code is used

* PasswordFragment: Make uninitialized repo Snackbar indefinite

* spotless

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya
2020-04-24 02:05:07 +05:30
committed by GitHub
parent a5437c480a
commit bee20ac44a
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
View File

@@ -26,6 +26,7 @@ import com.google.android.material.snackbar.Snackbar
import com.zeapo.pwdstore.databinding.PasswordRecyclerViewBinding
import com.zeapo.pwdstore.git.BaseGitActivity
import com.zeapo.pwdstore.git.GitOperationActivity
import com.zeapo.pwdstore.git.GitServerConfigActivity
import com.zeapo.pwdstore.ui.OnOffItemAnimator
import com.zeapo.pwdstore.ui.adapters.PasswordItemRecyclerAdapter
import com.zeapo.pwdstore.ui.dialogs.ItemCreationBottomSheet
@@ -69,8 +70,13 @@ class PasswordFragment : Fragment() {
swipeRefresher = binding.swipeRefresher
swipeRefresher.setOnRefreshListener {
if (!PasswordRepository.isGitRepo()) {
Snackbar.make(binding.root, getString(R.string.clone_git_repo), Snackbar.LENGTH_SHORT)
.show()
Snackbar.make(binding.root, getString(R.string.clone_git_repo), Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.clone_button) {
val intent = Intent(context, GitServerConfigActivity::class.java)
intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_CLONE)
startActivityForResult(intent, BaseGitActivity.REQUEST_CLONE)
}
.show()
swipeRefresher.isRefreshing = false
} else {
val intent = Intent(context, GitOperationActivity::class.java)

4
app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
View File

@@ -20,6 +20,10 @@ open class GitOperationActivity : BaseGitActivity() {
REQUEST_PULL -> syncRepository(REQUEST_PULL)
REQUEST_PUSH -> syncRepository(REQUEST_PUSH)
REQUEST_SYNC -> syncRepository(REQUEST_SYNC)
else -> {
setResult(RESULT_CANCELED)
finish()
}
}
}

4
app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
View File

@@ -80,7 +80,9 @@ open class PasswordRepository protected constructor() {
fun isGitRepo(): Boolean {
if (repository != null) {
// Check if remote exists
return repository!!.config.getSubsections("remote").isNotEmpty()
return repository!!.config.getSubsections("remote").isNotEmpty() &&
repository!!.objectDatabase.exists() &&
repository!!.allRefs.isNotEmpty()
}
return false
}

4
app/src/main/res/values/strings.xml
View File

@@ -100,7 +100,7 @@
<string name="git_user_email">Email</string>
<string name="git_user_email_hint">email</string>
<string name="invalid_email_dialog_text">Please enter a valid email address</string>
<string name="clone_button">Clone!</string>
<string name="clone_button">Clone</string>
<!-- PGP Handler -->
<string name="crypto_name_hint">Name</string>
@@ -344,7 +344,7 @@
<string name="pref_search_on_start_hint">Open search bar when app is launched</string>
<string name="password_generator_category_title">Password Generator</string>
<string name="tap_clear_clipboard">Tap here to clear clipboard</string>
<string name="clone_git_repo">Clone a git repository to sync changes</string>
<string name="clone_git_repo">The repository must be cloned before syncing changes.</string>
<string name="theme_title">App theme</string>
<string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>