From 52e2139f6afc14a2b442e89b4bcb2095870c6a0f Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Wed, 12 Aug 2020 02:48:54 +0530
Subject: 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>
---
 CHANGELOG.md                                                  |  1 +
 .../main/java/com/zeapo/pwdstore/git/GitCommandExecutor.kt    | 11 +++++++++++
 app/src/main/res/values/strings.xml                           |  1 +
 3 files changed, 13 insertions(+)

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>
-- 
cgit v1.2.3