diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-09 14:06:23 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-27 13:53:01 +0200 |
commit | ce1c3d1a1ee7f8d9b482419801aee494928741d2 (patch) | |
tree | 42be4216384c5ba167f4f8eb1b9d93d5731539da /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | e7fa124108e72b0eaaa1319467d666d876278467 (diff) | |
download | open-keychain-ce1c3d1a1ee7f8d9b482419801aee494928741d2.tar.gz open-keychain-ce1c3d1a1ee7f8d9b482419801aee494928741d2.tar.bz2 open-keychain-ce1c3d1a1ee7f8d9b482419801aee494928741d2.zip |
rename SaveKeyringParcel to OldSaveKeyringParcel
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OldSaveKeyringParcel.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java) | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 250e1cdda..c2fc4334a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -497,7 +497,7 @@ public class KeychainIntentService extends IntentService } else if (ACTION_SAVE_KEYRING.equals(action)) { try { /* Input */ - SaveKeyringParcel saveParcel = data.getParcelable(SAVE_KEYRING_PARCEL); + OldSaveKeyringParcel saveParcel = data.getParcelable(SAVE_KEYRING_PARCEL); String oldPassphrase = saveParcel.oldPassphrase; String newPassphrase = saveParcel.newPassphrase; boolean canSign = true; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OldSaveKeyringParcel.java index 60fdf895d..b722393ad 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OldSaveKeyringParcel.java @@ -31,7 +31,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; -public class SaveKeyringParcel implements Parcelable { +/** Class for parcelling data between ui and services. + * This class is outdated and scheduled for removal, pending a rewrite of the + * EditKeyActivity and save keyring routines. + */ +@Deprecated +public class OldSaveKeyringParcel implements Parcelable { public ArrayList<String> userIds; public ArrayList<String> originalIDs; @@ -48,9 +53,9 @@ public class SaveKeyringParcel implements Parcelable { public ArrayList<UncachedSecretKey> keys; public String originalPrimaryID; - public SaveKeyringParcel() {} + public OldSaveKeyringParcel() {} - private SaveKeyringParcel(Parcel source) { + private OldSaveKeyringParcel(Parcel source) { userIds = (ArrayList<String>) source.readSerializable(); originalIDs = (ArrayList<String>) source.readSerializable(); deletedIDs = (ArrayList<String>) source.readSerializable(); @@ -90,13 +95,13 @@ public class SaveKeyringParcel implements Parcelable { destination.writeString(originalPrimaryID); } - public static final Creator<SaveKeyringParcel> CREATOR = new Creator<SaveKeyringParcel>() { - public SaveKeyringParcel createFromParcel(final Parcel source) { - return new SaveKeyringParcel(source); + public static final Creator<OldSaveKeyringParcel> CREATOR = new Creator<OldSaveKeyringParcel>() { + public OldSaveKeyringParcel createFromParcel(final Parcel source) { + return new OldSaveKeyringParcel(source); } - public SaveKeyringParcel[] newArray(final int size) { - return new SaveKeyringParcel[size]; + public OldSaveKeyringParcel[] newArray(final int size) { + return new OldSaveKeyringParcel[size]; } }; |