aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-25 11:12:52 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-25 11:12:52 +0100
commit1ef63f31879f599851058c0d36918df4fb671fc4 (patch)
treede69a2fa0bda5757d63f6322931a318b5d9992c2 /OpenKeychain
parent5e024bba2e7b5a0d91735488f9d31850cbf81d8d (diff)
downloadopen-keychain-1ef63f31879f599851058c0d36918df4fb671fc4.tar.gz
open-keychain-1ef63f31879f599851058c0d36918df4fb671fc4.tar.bz2
open-keychain-1ef63f31879f599851058c0d36918df4fb671fc4.zip
Fix certify with CryptoInputParcel
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java12
3 files changed, 6 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
index 44773e501..20a280a54 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
@@ -164,7 +164,7 @@ public class CertifyKeyFragment extends CryptoOperationFragment
Notify.create(getActivity(), getString(R.string.select_key_to_certify),
Notify.Style.ERROR).show();
} else {
- cryptoOperation(null);
+ cryptoOperation(new CryptoInputParcel());
}
}
});
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index 2375c1d30..bf17c2991 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -151,7 +151,7 @@ public class EditKeyFragment extends CryptoOperationFragment implements
if (mDataUri == null) {
returnKeyringParcel();
} else {
- cryptoOperation(new CryptoInputParcel(new Date()));
+ cryptoOperation(new CryptoInputParcel());
}
}
}, new OnClickListener() {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
index a498d0763..a6fad8881 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
@@ -37,10 +37,6 @@ import java.util.regex.Matcher;
public class EncryptDecryptOverviewFragment extends Fragment {
- View mEncryptFile;
- View mEncryptText;
- View mDecryptFile;
- View mDecryptFromClipboard;
View mClipboardIcon;
@Override
@@ -53,10 +49,10 @@ public class EncryptDecryptOverviewFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.encrypt_decrypt_overview_fragment, container, false);
- mEncryptFile = view.findViewById(R.id.encrypt_files);
- mEncryptText = view.findViewById(R.id.encrypt_text);
- mDecryptFile = view.findViewById(R.id.decrypt_files);
- mDecryptFromClipboard = view.findViewById(R.id.decrypt_from_clipboard);
+ View mEncryptFile = view.findViewById(R.id.encrypt_files);
+ View mEncryptText = view.findViewById(R.id.encrypt_text);
+ View mDecryptFile = view.findViewById(R.id.decrypt_files);
+ View mDecryptFromClipboard = view.findViewById(R.id.decrypt_from_clipboard);
mClipboardIcon = view.findViewById(R.id.clipboard_icon);
mEncryptFile.setOnClickListener(new View.OnClickListener() {