mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 05:48:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

6
app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
View File

@ -89,8 +89,11 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
Toast.makeText(this, "No OpenPGP Provider selected!", Toast.LENGTH_LONG).show(); Toast.makeText(this, "No OpenPGP Provider selected!", Toast.LENGTH_LONG).show();
Intent intent = new Intent(this, UserPreference.class); Intent intent = new Intent(this, UserPreference.class);
startActivity(intent); 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 // bind to service
mServiceConnection = new OpenPgpServiceConnection( mServiceConnection = new OpenPgpServiceConnection(
@ -105,6 +108,7 @@ public class PgpHandler extends Activity implements OpenPgpServiceConnection.OnB
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
} }
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {

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

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