cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: handle passphrase entering correctly

Browse Source
This commit is contained in:
Dominik Schürmann
2013-09-08 18:30:22 +02:00
parent 03d9afffce
commit 11103623c5
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
View File

@@ -161,7 +161,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
try {
mServiceCallback.onRegistered(true, packageName);
} catch (RemoteException e) {
Log.e(Constants.TAG, "ServiceActivity");
Log.e(Constants.TAG, "ServiceActivity", e);
}
finish();
}
@@ -174,7 +174,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
try {
mServiceCallback.onRegistered(false, packageName);
} catch (RemoteException e) {
Log.e(Constants.TAG, "ServiceActivity");
Log.e(Constants.TAG, "ServiceActivity", e);
}
finish();
}
@@ -205,7 +205,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
mServiceCallback.onSelectedPublicKeys(mSelectFragment
.getSelectedMasterKeyIds());
} catch (RemoteException e) {
Log.e(Constants.TAG, "ServiceActivity");
Log.e(Constants.TAG, "ServiceActivity", e);
}
finish();
}
@@ -219,7 +219,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
mServiceCallback.onSelectedPublicKeys(mSelectFragment
.getSelectedMasterKeyIds());
} catch (RemoteException e) {
Log.e(Constants.TAG, "ServiceActivity");
Log.e(Constants.TAG, "ServiceActivity", e);
}
finish();
}
@@ -266,14 +266,14 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
try {
mServiceCallback.onCachedPassphrase(true);
} catch (RemoteException e) {
Log.e(Constants.TAG, "ServiceActivity");
Log.e(Constants.TAG, "ServiceActivity", e);
}
finish();
} else {
try {
mServiceCallback.onCachedPassphrase(false);
} catch (RemoteException e) {
Log.e(Constants.TAG, "ServiceActivity");
Log.e(Constants.TAG, "ServiceActivity", e);
}
finish();
}

11
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
View File

@@ -60,6 +60,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
private static final String ARG_SECRET_KEY_ID = "secret_key_id";
public static final int MESSAGE_OKAY = 1;
public static final int MESSAGE_CANCEL = 2;
private Messenger mMessenger;
private EditText mPassphraseEditText;
@@ -215,7 +216,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
@Override
public void onClick(DialogInterface dialog, int id) {
dismiss();
dialog.cancel();
}
});
@@ -235,6 +236,14 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
}
}
@Override
public void onCancel(DialogInterface dialog) {
super.onCancel(dialog);
dismiss();
sendMessageToHandler(MESSAGE_CANCEL);
}
/**
* Associate the "done" button on the soft keyboard with the okay button in the view
*/