aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2019-10-02 18:04:18 +0530
committerGitHub <noreply@github.com>2019-10-02 18:04:18 +0530
commitf1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e (patch)
tree2afb98c921714ccefcd22f35a7340584d1bfba53 /app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt
parent9a1a54a6fcfa6fd6cf142f2af9804375255d14cf (diff)
downloadHardenedPass-f1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e.tar.gz
HardenedPass-f1f59dc1ed26c2351dc31e55902ff8e4b5a6ed0e.zip
Add Spotless to regulate codestyle (#550)
* Add Spotless to regulate codestyle * treewide: Run spotless * Add spotlessCheck to CI test Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt
index 90c46878..1ec8ec92 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.kt
@@ -10,7 +10,7 @@ import java.io.File
/**
* Creates a new git operation
*
- * @param fileDir the git working tree directory
+ * @param fileDir the git working tree directory
* @param callingActivity the calling activity
*/
class PullOperation(fileDir: File, callingActivity: Activity) : GitOperation(fileDir, callingActivity) {
@@ -36,10 +36,10 @@ class PullOperation(fileDir: File, callingActivity: Activity) : GitOperation(fil
override fun onError(errorMessage: String) {
MaterialAlertDialogBuilder(callingActivity)
.setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
- .setMessage("Error occured during the pull operation, "
- + callingActivity.resources.getString(R.string.jgit_error_dialog_text)
- + errorMessage
- + "\nPlease check the FAQ for possible reasons why this error might occur.")
+ .setMessage("Error occured during the pull operation, " +
+ callingActivity.resources.getString(R.string.jgit_error_dialog_text) +
+ errorMessage +
+ "\nPlease check the FAQ for possible reasons why this error might occur.")
.setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> callingActivity.finish() }
.show()
}