diff options
| author | kLeZ <julius8774@gmail.com> | 2014-09-23 09:21:24 +0200 |
|---|---|---|
| committer | kLeZ <julius8774@gmail.com> | 2014-09-23 09:21:24 +0200 |
| commit | cac3e8e71c1b073d6f3b65dbb301c56ce7fa7fa7 (patch) | |
| tree | 68384369627d70b58eaf8e93a0425b703e78172b /app/src/main/java/com/zeapo/pwdstore/crypto | |
| parent | 1e860374e2df56bbbbbb70ad6c32729655c5898c (diff) | |
| parent | 75d03937d4561be8db94c3753d20034323bab3da (diff) | |
| download | HardenedPass-cac3e8e71c1b073d6f3b65dbb301c56ce7fa7fa7.tar.gz HardenedPass-cac3e8e71c1b073d6f3b65dbb301c56ce7fa7fa7.zip | |
Merge branch 'master' of github.com:zeapo/Android-Password-Store
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index f80893a4..3213fd2e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -63,6 +63,7 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB private ProgressDialog bindingDialog; + private boolean registered; public static final int REQUEST_CODE_SIGN = 9910; public static final int REQUEST_CODE_ENCRYPT = 9911; @@ -90,6 +91,8 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB accountName = settings.getString("openpgp_account_name", ""); keyIDs = settings.getString("openpgp_key_ids", ""); + registered = false; + if (TextUtils.isEmpty(providerPackageName)) { Toast.makeText(this, "No OpenPGP Provider selected!", Toast.LENGTH_LONG).show(); Intent intent = new Intent(this, UserPreference.class); @@ -110,6 +113,8 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB bindingDialog.setCancelable(false); bindingDialog.show(); + registered = true; + ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); } @@ -118,8 +123,12 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB @Override public void onStop(){ super.onStop(); - if (this.mServiceConnection.isBound()) - this.mServiceConnection.unbindFromService(); + if (this.registered && this.mServiceConnection.isBound()) + try { + this.mServiceConnection.unbindFromService(); + } catch (Exception e){ + + } } @Override |