aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
diff options
context:
space:
mode:
authorzeapo <mohamed@zenadi.com>2017-06-05 14:46:16 +0200
committerzeapo <mohamed@zenadi.com>2017-06-05 14:46:16 +0200
commit38d02885ecc3a153d13efec2a3ee5613fad15227 (patch)
treeed16b8026b1823f8de780e24ca1bccb718045e0b /app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
parentbbd7f661918fa2a96c7c2f2d954c0a10dc24ce9b (diff)
downloadHardenedPass-38d02885ecc3a153d13efec2a3ee5613fad15227.tar.gz
HardenedPass-38d02885ecc3a153d13efec2a3ee5613fad15227.zip
Do not lock the interface for any operation in the gitactivity
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java26
1 files changed, 8 insertions, 18 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 644d3c6b..06a9376e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
@@ -32,19 +32,15 @@ public class GitAsyncTask extends AsyncTask<GitCommand, String, String> {
}
protected void onPreExecute() {
-// Toast.makeText(activity.getApplicationContext(), String.format("Running %s", operation.toString()), Toast.LENGTH_LONG).show();
- snack = Snackbar.make(activity.findViewById(R.id.main_layout),
- Html.fromHtml(String.format("<font color=\"#ffffff\">Running the Git operation %s</font>", operation.toString())),
- Snackbar.LENGTH_INDEFINITE);
- snack.show();
+ Toast.makeText(activity.getApplicationContext(),
+ Html.fromHtml(String.format("<font color=\"#ffffff\">Running %s</font>", operation.getClass().getSimpleName())),
+ Toast.LENGTH_LONG).show();
}
protected void onProgressUpdate(String... progress) {
- if (this.snack != null) snack.dismiss();
- snack = Snackbar.make(activity.findViewById(R.id.main_layout),
- Html.fromHtml(String.format("<font color=\"#ffffff\">Running: <strong>%s</strong></font>", progress[0])),
- Snackbar.LENGTH_INDEFINITE);
- snack.show();
+ Toast.makeText(activity.getApplicationContext(),
+ Html.fromHtml(String.format("<font color=\"#ffffff\">Running jgit command: <strong>%s</strong></font>", progress[0])),
+ Toast.LENGTH_LONG).show();
}
@Override
@@ -63,7 +59,8 @@ public class GitAsyncTask extends AsyncTask<GitCommand, String, String> {
} else {
command.call();
}
- publishProgress(command.getClass().getName());
+ String opName = command.getClass().getSimpleName();
+ publishProgress(opName);
} catch (Exception e) {
e.printStackTrace();
return e.getMessage() + "\nCaused by:\n" + e.getCause();
@@ -73,13 +70,6 @@ public class GitAsyncTask extends AsyncTask<GitCommand, String, String> {
}
protected void onPostExecute(String result) {
- if (this.snack != null)
- try {
- this.snack.dismiss();
- } catch (Exception e) {
- // ignore
- }
-
if (result == null)
result = "Unexpected error";