a6e25e6448
Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
119 lines
3.7 KiB
Java
119 lines
3.7 KiB
Java
/*
|
|
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
|
* Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
package org.sufficientlysecure.keychain.service;
|
|
|
|
import android.os.Parcel;
|
|
import android.os.Parcelable;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Date;
|
|
import java.util.Map;
|
|
|
|
import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
|
|
import org.sufficientlysecure.keychain.util.ParcelableProxy;
|
|
|
|
|
|
/**
|
|
* This class is a a transferable representation for a number of keyrings to
|
|
* be certified.
|
|
*/
|
|
public class CertifyActionsParcel implements Parcelable {
|
|
|
|
// the master key id to certify with
|
|
final public long mMasterKeyId;
|
|
public CertifyLevel mLevel;
|
|
|
|
public ArrayList<CertifyAction> mCertifyActions = new ArrayList<>();
|
|
|
|
public String keyServerUri;
|
|
|
|
public CertifyActionsParcel(long masterKeyId) {
|
|
mMasterKeyId = masterKeyId;
|
|
mLevel = CertifyLevel.DEFAULT;
|
|
}
|
|
|
|
public CertifyActionsParcel(Parcel source) {
|
|
mMasterKeyId = source.readLong();
|
|
// just like parcelables, this is meant for ad-hoc IPC only and is NOT portable!
|
|
mLevel = CertifyLevel.values()[source.readInt()];
|
|
keyServerUri = source.readString();
|
|
|
|
mCertifyActions = (ArrayList<CertifyAction>) source.readSerializable();
|
|
}
|
|
|
|
public void add(CertifyAction action) {
|
|
mCertifyActions.add(action);
|
|
}
|
|
|
|
@Override
|
|
public void writeToParcel(Parcel destination, int flags) {
|
|
destination.writeLong(mMasterKeyId);
|
|
destination.writeInt(mLevel.ordinal());
|
|
destination.writeString(keyServerUri);
|
|
|
|
destination.writeSerializable(mCertifyActions);
|
|
}
|
|
|
|
public static final Creator<CertifyActionsParcel> CREATOR = new Creator<CertifyActionsParcel>() {
|
|
public CertifyActionsParcel createFromParcel(final Parcel source) {
|
|
return new CertifyActionsParcel(source);
|
|
}
|
|
|
|
public CertifyActionsParcel[] newArray(final int size) {
|
|
return new CertifyActionsParcel[size];
|
|
}
|
|
};
|
|
|
|
// TODO make this parcelable
|
|
public static class CertifyAction implements Serializable {
|
|
final public long mMasterKeyId;
|
|
|
|
final public ArrayList<String> mUserIds;
|
|
final public ArrayList<WrappedUserAttribute> mUserAttributes;
|
|
|
|
public CertifyAction(long masterKeyId, List<String> userIds, List<WrappedUserAttribute> attributes) {
|
|
mMasterKeyId = masterKeyId;
|
|
mUserIds = userIds == null ? null : new ArrayList<>(userIds);
|
|
mUserAttributes = attributes == null ? null : new ArrayList<>(attributes);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public int describeContents() {
|
|
return 0;
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
String out = "mMasterKeyId: " + mMasterKeyId + "\n";
|
|
out += "mLevel: " + mLevel + "\n";
|
|
out += "mCertifyActions: " + mCertifyActions + "\n";
|
|
|
|
return out;
|
|
}
|
|
|
|
// All supported algorithms
|
|
public enum CertifyLevel {
|
|
DEFAULT, NONE, CASUAL, POSITIVE
|
|
}
|
|
|
|
}
|