diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-08-12 02:48:54 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 23:18:54 +0200 |
| commit | 52e2139f6afc14a2b442e89b4bcb2095870c6a0f (patch) | |
| tree | 65be09416a5ad0f50ad3f5745666669bc16c0760 | |
| parent | 15aa92980239d6d61c3b0febc0407b7f63e152b3 (diff) | |
Notify user when remote branch is up-to-date (#1009)
* Notify user when remote branch is up-to-date
Fixes #1000
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Update changelog
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt | 11 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b2249a0..94c94c31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file. - Slightly reduce APK size - Always show the parent path in entries - Passwords will no longer be copied to the clipboard by default +- Notify user if there was nothing to push ### Fixed diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt index 24c42df2..4f4797d8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt @@ -7,6 +7,7 @@ package com.zeapo.pwdstore.git import android.app.Activity import android.content.Intent +import android.widget.Toast import androidx.fragment.app.FragmentActivity import com.github.ajalt.timberkt.e import com.google.android.material.snackbar.Snackbar @@ -86,6 +87,16 @@ class GitCommandExecutor( PushException(PushException.Reason.GENERIC, rru.message) } } + RemoteRefUpdate.Status.UP_TO_DATE -> { + withContext(Dispatchers.Main) { + Toast.makeText( + activity.applicationContext, + activity.applicationContext.getString(R.string.git_push_up_to_date), + Toast.LENGTH_SHORT + ).show() + } + null + } else -> null } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46dfa401..347de2ed 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,6 +214,7 @@ <string name="git_sync">Synchronize repository</string> <string name="git_pull">Pull from remote</string> <string name="git_push">Push to remote</string> + <string name="git_push_up_to_date">Everything up-to-date</string> <string name="show_password_pref_title">Show the password</string> <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted. This does not disable copying to clipboard.</string> <string name="show_extra_content_pref_title">Show extra content</string> |