From c200566bcaec971e1756afe5ebf96baf09e88816 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 2 Jan 2019 22:44:52 +0530 Subject: Bump minSdk to 21 (#466) * Bump minSdk to 21 Signed-off-by: Harsh Shandilya * PasswordGenerator: Constify things Signed-off-by: Harsh Shandilya * Deprecate PRNG fixes The problem being fixed doesn't exist on SDK 21 and above. Signed-off-by: Harsh Shandilya * treewide: Switch to lambdas Signed-off-by: Harsh Shandilya * treewide: Formatting fixes Signed-off-by: Harsh Shandilya * treewide: Remove useless casts and add missing annotations Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java') 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(); } } -- cgit v1.2.3