moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 14:41:54 -05:00
Code Issues Releases Wiki Activity

return key ids from PassphraseDialogActivity, accept null userids

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-03-08 04:41:41 +01:00
parent ea7068acdf
commit b57bcefe08
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
View File

@ -85,8 +85,8 @@ public class CertifyActionsParcel implements Parcelable {
public CertifyAction(long masterKeyId, List<String> userIds, public CertifyAction(long masterKeyId, List<String> userIds,
List<WrappedUserAttribute> attributes) { List<WrappedUserAttribute> attributes) {
mMasterKeyId = masterKeyId; mMasterKeyId = masterKeyId;
mUserIds = new ArrayList<>(userIds); mUserIds = userIds == null ? null : new ArrayList<>(userIds);
mUserAttributes = new ArrayList<>(attributes); mUserAttributes = attributes == null ? null : new ArrayList<>(attributes);
} }
} }

1
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
View File

@ -31,7 +31,6 @@ import android.os.Bundle;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.app.LoaderManager; import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader; import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
View File

@ -63,6 +63,7 @@ import org.sufficientlysecure.keychain.util.Preferences;
*/ */
public class PassphraseDialogActivity extends FragmentActivity { public class PassphraseDialogActivity extends FragmentActivity {
public static final String MESSAGE_DATA_PASSPHRASE = "passphrase"; public static final String MESSAGE_DATA_PASSPHRASE = "passphrase";
public static final String EXTRA_KEY_ID = "key_id";
public static final String EXTRA_SUBKEY_ID = "secret_key_id"; public static final String EXTRA_SUBKEY_ID = "secret_key_id";
@ -413,6 +414,8 @@ public class PassphraseDialogActivity extends FragmentActivity {
// also return passphrase back to activity // also return passphrase back to activity
Intent returnIntent = new Intent(); Intent returnIntent = new Intent();
returnIntent.putExtra(MESSAGE_DATA_PASSPHRASE, passphrase); returnIntent.putExtra(MESSAGE_DATA_PASSPHRASE, passphrase);
returnIntent.putExtra(EXTRA_KEY_ID, mSecretRing.getMasterKeyId());
returnIntent.putExtra(EXTRA_SUBKEY_ID, mSubKeyId);
getActivity().setResult(RESULT_OK, returnIntent); getActivity().setResult(RESULT_OK, returnIntent);
} }

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
View File

@ -128,10 +128,6 @@ public abstract class KeySpinner extends TintSpinner implements LoaderManager.Lo
} }
} }
public long getSelectedKeyId() {
return mSelectedKeyId;
}
public void setSelectedKeyId(long selectedKeyId) { public void setSelectedKeyId(long selectedKeyId) {
this.mSelectedKeyId = selectedKeyId; this.mSelectedKeyId = selectedKeyId;
} }