From e41287cb164b734dd19dc63d88235dd75509547d Mon Sep 17 00:00:00 2001 From: Christoph Böhmwalder Date: Tue, 26 Dec 2017 14:35:25 +0100 Subject: show age for passwords in detail view (#339) * show age for passwords in detail view Implements #330. This fetches the latest commit where the respective password file was changed from the current HEAD and outputs the relative time since the last change on the decrypt page. * Move lastChanged logic out of PgpActivity This nicely encapsulates the lastChanged logic (and thus separates it from dependencies like git). The last changed date is now passed as a timestamp using the Intent's extra info. --- .../java/com/zeapo/pwdstore/PasswordStore.java | 31 ++++++++++++++++++++++ .../java/com/zeapo/pwdstore/crypto/PgpActivity.kt | 22 +++++++++++++++ app/src/main/res/layout/decrypt_layout.xml | 13 +++++++++ app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 ++ 11 files changed, 76 insertions(+) diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index acfadf99..99593700 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -42,7 +42,9 @@ import com.zeapo.pwdstore.utils.PasswordRepository; import org.apache.commons.io.FileUtils; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; import java.io.File; import java.util.ArrayList; @@ -406,11 +408,40 @@ public class PasswordStore extends AppCompatActivity { } } + private String getRelativePath(String fullPath, String repositoryPath) { + return fullPath.replace(repositoryPath, "").replaceAll("/+", "/"); + } + + public int getLastChangedTimestamp(String fullPath) { + File repoPath = PasswordRepository.getRepositoryDirectory(this); + Repository repository = PasswordRepository.getRepository(repoPath); + + if (repository == null) { + return -1; + } + + Git git = new Git(repository); + String relativePath = getRelativePath(fullPath, repoPath.getAbsolutePath()).substring(1); + Iterable iterable; + + try { + iterable = git.log().addPath(relativePath).call(); + } catch (GitAPIException e) { + System.out.println("Exception caught :("); + e.printStackTrace(); + return -1; + } + + RevCommit latestCommit = iterable.iterator().next(); + return latestCommit.getCommitTime(); + } + public void decryptPassword(PasswordItem item) { Intent intent = new Intent(this, PgpActivity.class); intent.putExtra("NAME", item.toString()); intent.putExtra("FILE_PATH", item.getFile().getAbsolutePath()); intent.putExtra("REPO_PATH", PasswordRepository.getRepositoryDirectory(getApplicationContext()).getAbsolutePath()); + intent.putExtra("LAST_CHANGED_TIMESTAMP", getLastChangedTimestamp(item.getFile().getAbsolutePath())); intent.putExtra("OPERATION", "DECRYPT"); // Adds shortcut diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt index 19b71b72..1a8a5051 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt @@ -12,6 +12,7 @@ import android.os.SystemClock import android.preference.PreferenceManager import android.support.v7.app.AppCompatActivity import android.text.TextUtils +import android.text.format.DateUtils import android.text.method.PasswordTransformationMethod import android.util.Log import android.view.* @@ -20,6 +21,7 @@ import com.zeapo.pwdstore.PasswordEntry import com.zeapo.pwdstore.R import com.zeapo.pwdstore.UserPreference import com.zeapo.pwdstore.pwgenDialogFragment +import com.zeapo.pwdstore.utils.PasswordRepository import com.zeapo.pwdstore.utils.Totp import kotlinx.android.synthetic.main.decrypt_layout.* import kotlinx.android.synthetic.main.encrypt_layout.* @@ -47,6 +49,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { private val fullPath: String by lazy { intent.getStringExtra("FILE_PATH") } private val name: String by lazy { getName(fullPath, repoPath) } + private val lastChangedString: CharSequence by lazy { getLastChangedString(intent.getIntExtra("LAST_CHANGED_TIMESTAMP", -1)) } private val relativeParentPath: String by lazy { getParentPath(fullPath, repoPath) } private val settings: SharedPreferences by lazy { PreferenceManager.getDefaultSharedPreferences(this) } @@ -76,6 +79,13 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { setContentView(R.layout.decrypt_layout) crypto_password_category_decrypt.text = relativeParentPath crypto_password_file.text = name + + crypto_password_last_changed.text = try { + this.resources.getString(R.string.last_changed, lastChangedString) + } catch (e: RuntimeException) { + showToast(getString(R.string.get_last_changed_failed)) + "" + } } "ENCRYPT" -> { setContentView(R.layout.encrypt_layout) @@ -514,6 +524,18 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { delayTask?.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) } + /** + * Gets a relative string describing when this shape was last changed + * (e.g. "one hour ago") + */ + private fun getLastChangedString(timeStamp: Int): CharSequence { + if (timeStamp < 0) { + throw RuntimeException() + } + + return DateUtils.getRelativeTimeSpanString(this, timeStamp.toLong() * 1000, true) + } + @SuppressLint("StaticFieldLeak") inner class DelayShow(val activity: PgpActivity) : AsyncTask() { private val pb: ProgressBar by lazy { pbLoading } diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 48247c57..e5095d66 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -43,6 +43,19 @@ android:textSize="24sp" android:textStyle="bold" tools:ignore="HardcodedText" /> + + Nebyl vybrát externí repozitář Odeslat heslo jako plaintext za použití… Pokaż hasło + Failed to get last changed date \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 80b16cd9..8c63a37b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -194,4 +194,6 @@ Bildschirmfoto Accessibility Services Bildschirmfoto des Schalters in Accessibility Services Bildschirmfoto von Autofill in Aktion + Zuletzt geändert %s + Das Abrufen des letzten Änderungsdatums ist fehlgeschlagen. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3180a494..6db46765 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -186,4 +186,5 @@ Afficher le contenu supplémentaire Nom d\'utilisateur Impossible d\'ouvrir la clef ssh, merci de vérifier que le ficher existe + Failed to get last changed date diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9ab13ff0..def249be 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -157,4 +157,5 @@ 外部リポジトリが選択されていません パスワードをプレーンテキストとして送信… パスワードを表示 + Failed to get last changed date diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 24fe4e58..d8177901 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -188,4 +188,5 @@ Вставить Вставить имя пользователя?\n\n%s Выберите поле ввода для вставки имени пользователя.\nИмя пользователя можно вставить в течение %d секунд. + Failed to get last changed date diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ba6dfa5a..bcba3ca2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -121,4 +121,5 @@ 生成的 URL 匹配… 加密 + Failed to get last changed date \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 43e51818..d0970f00 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -121,4 +121,5 @@ 生成的 URL 匹配… 加密 + Failed to get last changed date diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd286625..8a5f0e39 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,6 +98,7 @@ Copy password Copy username Share as plaintext + Last changed %s Git @@ -217,4 +218,5 @@ Commit hash p@ssw0rd! username: something other extra content + Failed to get last changed date -- cgit v1.2.3