summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
index cde2519f..ad93b2ce 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
@@ -35,22 +35,23 @@ public class GitAsyncTask extends AsyncTask<GitCommand, String, String> {
}
protected void onPreExecute() {
- final Spanned message = Html.fromHtml(String.format("<font color=\"#ffffff\">Running %s</font>", operation.getClass().getSimpleName()));
-
if (lockAndFinishActivity) {
+ final Spanned message = Html.fromHtml(String.format("Running %s", operation.getClass().getSimpleName()));
this.dialog.setMessage(message);
this.dialog.setCancelable(false);
this.dialog.show();
} else {
+ final Spanned message = Html.fromHtml(String.format("<font color=\"#ffffff\">Running %s</font>", operation.getClass().getSimpleName()));
Toast.makeText(activity.getApplicationContext(), message, Toast.LENGTH_LONG).show();
}
}
protected void onProgressUpdate(String... progress) {
- final Spanned message = Html.fromHtml(String.format("<font color=\"#ffffff\">Running jgit command: <strong>%s</strong></font>", progress[0]));
if (lockAndFinishActivity) {
+ final Spanned message = Html.fromHtml(String.format("Running jgit command: <strong>%s</strong>", progress[0]));
this.dialog.setMessage(message);
} else {
+ final Spanned message = Html.fromHtml(String.format("<font color=\"#ffffff\">Running jgit command: <strong>%s</strong></font>", progress[0]));
Toast.makeText(activity.getApplicationContext(), message, Toast.LENGTH_LONG).show();
}
}