kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

avoid eternal looping when selecting an openpgp provider

Browse source
This commit is contained in:
zeapo 2014-08-23 19:35:59 +02:00
parent c7d541c197
commit 9784af6d66
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,21 +89,25 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
Toast.makeText(this, "No OpenPGP Provider selected!", Toast.LENGTH_LONG).show();
Intent intent = new Intent(this, UserPreference.class);
startActivity(intent);
// a small hack to avoid eternal loop later, have to be solved via a startactivityforresult()
setResult(RESULT_CANCELED);
finish();
} else {
// bind to service
mServiceConnection = new OpenPgpServiceConnection(
PgpHandler.this, providerPackageName, this);
mServiceConnection.bindToService();
bindingDialog = new ProgressDialog(this);
bindingDialog.setMessage("Waiting for OpenKeychain...");
bindingDialog.setCancelable(false);
bindingDialog.show();
ActionBar actionBar = getActionBar();
actionBar.setDisplayHomeAsUpEnabled(true);
}
// bind to service
mServiceConnection = new OpenPgpServiceConnection(
PgpHandler.this, providerPackageName, this );
mServiceConnection.bindToService();
bindingDialog = new ProgressDialog(this);
bindingDialog.setMessage("Waiting for OpenKeychain...");
bindingDialog.setCancelable(false);
bindingDialog.show();
ActionBar actionBar = getActionBar();
actionBar.setDisplayHomeAsUpEnabled(true);
}
@Override

3
app/src/main/res/xml/preference.xml
View file

@ -22,7 +22,8 @@
<EditTextPreference android:title="Set your OpenPGP account"
android:hint="mail@somewhere.tld"
android:key="openpgp_account_name"/>
android:key="openpgp_account_name"
android:inputType="textEmailAddress"/>
<Preference
android:title="Select OpenPGP Key id"