diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2019-01-02 22:44:52 +0530 |
|---|---|---|
| committer | حسين <zidhussein@gmail.com> | 2019-01-02 17:14:52 +0000 |
| commit | c200566bcaec971e1756afe5ebf96baf09e88816 (patch) | |
| tree | 15e692cdaffe08861df40849e31154409be96b46 /app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | |
| parent | d5e589d7e48d4f44a052ecbf2817f5051bd1005f (diff) | |
| download | HardenedPass-c200566bcaec971e1756afe5ebf96baf09e88816.tar.gz HardenedPass-c200566bcaec971e1756afe5ebf96baf09e88816.zip | |
Bump minSdk to 21 (#466)
* Bump minSdk to 21
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
* PasswordGenerator: Constify things
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
* Deprecate PRNG fixes
The problem being fixed doesn't exist on SDK 21 and above.
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
* treewide: Switch to lambdas
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
* treewide: Formatting fixes
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
* treewide: Remove useless casts and add missing annotations
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java index 1a903aaf..322a6206 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java @@ -2,13 +2,9 @@ package com.zeapo.pwdstore.git; import android.app.Activity; import android.app.AlertDialog; -import android.content.DialogInterface; - import com.zeapo.pwdstore.R; - import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.PullCommand; -import org.eclipse.jgit.merge.MergeStrategy; import java.io.File; @@ -26,6 +22,7 @@ public class PullOperation extends GitOperation { /** * Sets the command + * * @return the current object */ public PullOperation setCommand() { @@ -52,11 +49,6 @@ public class PullOperation extends GitOperation { + callingActivity.getResources().getString(R.string.jgit_error_dialog_text) + errorMessage + "\nPlease check the FAQ for possible reasons why this error might occur."). - setPositiveButton(callingActivity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - callingActivity.finish(); - } - }).show(); + setPositiveButton(callingActivity.getResources().getString(R.string.dialog_ok), (dialogInterface, i) -> callingActivity.finish()).show(); } } |
