nicolabs/Android-Password-Store
1
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store.git synced 2026-04-19 18:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert asynctask cancelling; allow parallel asynctasks

Browse source
This commit is contained in:
Matthew Wong 2015-08-26 03:25:55 -04:00
parent 6665c0b2e9
commit 540349542b
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
View file

@ -56,7 +56,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
SharedPreferences settings;
private Activity activity;
ClipboardManager clipboard;
AsyncTask delayShowTask;
private boolean registered;
@ -141,10 +140,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
break;
case R.id.edit_password:
editPassword();
if (delayShowTask != null) {
delayShowTask.cancel(true);
delayShowTask = null;
}
}
return super.onOptionsItemSelected(item);
}
@ -285,9 +280,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
if (showPassword) {
publishProgress(current);
}
if (isCancelled()) {
return false;
}
}
return true;
}
@ -302,8 +294,9 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
clipboard.setPrimaryClip(clip);
}
}
if (showPassword) {
if (showPassword && findViewById(R.id.crypto_password_show) != null) {
//clear password
// if decrypt layout changed to encrypt layout via edit button, no need for this
((TextView) findViewById(R.id.crypto_password_show)).setText("");
((TextView) findViewById(R.id.crypto_extra_show)).setText("");
findViewById(R.id.crypto_extra_show_layout).setVisibility(View.INVISIBLE);
@ -313,7 +306,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
}
}
@Override
protected void onProgressUpdate(Integer... values) {
if (showPassword) {
@ -401,7 +393,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne
copyToClipBoard();
}
delayShowTask = new DelayShow().execute();
new DelayShow().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
if (!showPassword) {
activity.setResult(RESULT_CANCELED);
activity.finish();