From d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 3 Feb 2015 18:39:07 +0100 Subject: Move encrypt decrypt operations in own starter activity --- Graphics/get-material-icons.sh | 3 +- .../keychain/ui/DecryptOverviewFragment.java | 130 ------------------ .../ui/EncryptDecryptOverviewFragment.java | 150 +++++++++++++++++++++ .../keychain/ui/NavDrawerActivity.java | 5 +- .../main/res/drawable-hdpi/ic_lock_black_24dp.png | Bin 0 -> 397 bytes .../res/drawable-hdpi/ic_lock_open_black_24dp.png | Bin 393 -> 0 bytes .../drawable-hdpi/ic_lock_outline_black_24dp.png | Bin 398 -> 0 bytes .../main/res/drawable-mdpi/ic_lock_black_24dp.png | Bin 0 -> 291 bytes .../res/drawable-mdpi/ic_lock_open_black_24dp.png | Bin 295 -> 0 bytes .../drawable-mdpi/ic_lock_outline_black_24dp.png | Bin 294 -> 0 bytes .../main/res/drawable-xhdpi/ic_lock_black_24dp.png | Bin 0 -> 498 bytes .../res/drawable-xhdpi/ic_lock_open_black_24dp.png | Bin 450 -> 0 bytes .../drawable-xhdpi/ic_lock_outline_black_24dp.png | Bin 484 -> 0 bytes .../res/drawable-xxhdpi/ic_lock_black_24dp.png | Bin 0 -> 636 bytes .../drawable-xxhdpi/ic_lock_open_black_24dp.png | Bin 615 -> 0 bytes .../drawable-xxhdpi/ic_lock_outline_black_24dp.png | Bin 675 -> 0 bytes .../res/drawable-xxxhdpi/ic_lock_black_24dp.png | Bin 0 -> 830 bytes .../drawable-xxxhdpi/ic_lock_open_black_24dp.png | Bin 881 -> 0 bytes .../ic_lock_outline_black_24dp.png | Bin 883 -> 0 bytes .../main/res/layout/decrypt_overview_fragment.xml | 96 ------------- .../layout/encrypt_decrypt_overview_fragment.xml | 125 +++++++++++++++++ OpenKeychain/src/main/res/values/strings.xml | 10 +- 22 files changed, 283 insertions(+), 236 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml create mode 100644 OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index e5077276e..b26e73c9c 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -10,8 +10,7 @@ python copy OpenKeychain navigation white refresh 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 -python copy OpenKeychain action black lock_open 24 -python copy OpenKeychain action black lock_outline 24 +python copy OpenKeychain action black lock 24 python copy OpenKeychain navigation black apps 24 python copy OpenKeychain action black help 24 python copy OpenKeychain action black settings 24 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java deleted file mode 100644 index 8407a8ca7..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (C) 2014-2015 Dominik Schürmann - * Copyright (C) 2014 Vincent Breitmoser - * - * 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 . - */ - -package org.sufficientlysecure.keychain.ui; - -import android.content.Intent; -import android.os.AsyncTask; -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; -import org.sufficientlysecure.keychain.operations.results.OperationResult; -import org.sufficientlysecure.keychain.pgp.PgpHelper; -import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker; - -import java.util.regex.Matcher; - -public class DecryptOverviewFragment extends Fragment { - - View mActionFile; - View mActionFromClipboard; - View mClipboardIcon; - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - } - - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.decrypt_overview_fragment, container, false); - - mActionFile = view.findViewById(R.id.decrypt_files); - mActionFromClipboard = view.findViewById(R.id.decrypt_from_clipboard); - mClipboardIcon = view.findViewById(R.id.clipboard_icon); - - mActionFile.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent filesDecrypt = new Intent(getActivity(), DecryptFilesActivity.class); - filesDecrypt.setAction(DecryptFilesActivity.ACTION_DECRYPT_DATA_OPEN); - startActivity(filesDecrypt); - } - }); - - mActionFromClipboard.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent clipboardDecrypt = new Intent(getActivity(), DecryptTextActivity.class); - clipboardDecrypt.setAction(DecryptTextActivity.ACTION_DECRYPT_FROM_CLIPBOARD); - startActivityForResult(clipboardDecrypt, 0); - } - }); - - return view; - } - - @Override - public void onResume() { - super.onResume(); - - // get text from clipboard - final CharSequence clipboardText = - ClipboardReflection.getClipboardText(getActivity()); - - // if it's null, nothing to do here /o/ - if (clipboardText == null) { - return; - } - - new AsyncTask() { - @Override - protected Boolean doInBackground(String... clipboardText) { - - // see if it looks like a pgp thing - Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText[0]); - boolean animate = matcher.matches(); - - // see if it looks like another pgp thing - if (!animate) { - matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText[0]); - animate = matcher.matches(); - } - return animate; - } - - @Override - protected void onPostExecute(Boolean animate) { - super.onPostExecute(animate); - - // if so, animate the clipboard icon just a bit~ - if (animate) { - SubtleAttentionSeeker.tada(mClipboardIcon, 1.5f).start(); - } - } - }.execute(clipboardText.toString()); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - // if a result has been returned, display a notify - if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { - OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); - result.createNotify(getActivity()).show(); - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java new file mode 100644 index 000000000..a498d0763 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2014-2015 Dominik Schürmann + * Copyright (C) 2014 Vincent Breitmoser + * + * 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 . + */ + +package org.sufficientlysecure.keychain.ui; + +import android.content.Intent; +import android.os.AsyncTask; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; +import org.sufficientlysecure.keychain.operations.results.OperationResult; +import org.sufficientlysecure.keychain.pgp.PgpHelper; +import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker; + +import java.util.regex.Matcher; + +public class EncryptDecryptOverviewFragment extends Fragment { + + View mEncryptFile; + View mEncryptText; + View mDecryptFile; + View mDecryptFromClipboard; + View mClipboardIcon; + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + } + + @Override + 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); + mClipboardIcon = view.findViewById(R.id.clipboard_icon); + + mEncryptFile.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent encrypt = new Intent(getActivity(), EncryptFilesActivity.class); + startActivity(encrypt); + } + }); + + mEncryptText.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent encrypt = new Intent(getActivity(), EncryptTextActivity.class); + startActivity(encrypt); + } + }); + + mDecryptFile.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent filesDecrypt = new Intent(getActivity(), DecryptFilesActivity.class); + filesDecrypt.setAction(DecryptFilesActivity.ACTION_DECRYPT_DATA_OPEN); + startActivity(filesDecrypt); + } + }); + + mDecryptFromClipboard.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent clipboardDecrypt = new Intent(getActivity(), DecryptTextActivity.class); + clipboardDecrypt.setAction(DecryptTextActivity.ACTION_DECRYPT_FROM_CLIPBOARD); + startActivityForResult(clipboardDecrypt, 0); + } + }); + + return view; + } + + @Override + public void onResume() { + super.onResume(); + + // get text from clipboard + final CharSequence clipboardText = + ClipboardReflection.getClipboardText(getActivity()); + + // if it's null, nothing to do here /o/ + if (clipboardText == null) { + return; + } + + new AsyncTask() { + @Override + protected Boolean doInBackground(String... clipboardText) { + + // see if it looks like a pgp thing + Matcher matcher = PgpHelper.PGP_MESSAGE.matcher(clipboardText[0]); + boolean animate = matcher.matches(); + + // see if it looks like another pgp thing + if (!animate) { + matcher = PgpHelper.PGP_CLEARTEXT_SIGNATURE.matcher(clipboardText[0]); + animate = matcher.matches(); + } + return animate; + } + + @Override + protected void onPostExecute(Boolean animate) { + super.onPostExecute(animate); + + // if so, animate the clipboard icon just a bit~ + if (animate) { + SubtleAttentionSeeker.tada(mClipboardIcon, 1.5f).start(); + } + } + }.execute(clipboardText.toString()); + } + + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + // if a result has been returned, display a notify + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); + result.createNotify(getActivity()).show(); + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java index 035bed412..d82e1c246 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java @@ -40,10 +40,7 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer { // create sections addSection(newSection(getString(R.string.title_keys), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment())); - - addSection(newSection(getString(R.string.title_encrypt_text), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptTextActivity.class))); - addSection(newSection(getString(R.string.title_encrypt_files), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptFilesActivity.class))); - addSection(newSection(getString(R.string.title_decrypt), R.drawable.ic_lock_open_black_24dp, new DecryptOverviewFragment())); + addSection(newSection(getString(R.string.nav_encrypt_decrypt), R.drawable.ic_lock_black_24dp, new EncryptDecryptOverviewFragment())); addSection(newSection(getString(R.string.title_api_registered_apps), R.drawable.ic_apps_black_24dp, new AppsListFragment())); // create bottom section diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png new file mode 100644 index 000000000..0888c6173 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 8ac075245..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png deleted file mode 100644 index fc019db72..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png new file mode 100644 index 000000000..d18d4b667 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 9e6d0f0ac..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png deleted file mode 100644 index 1df91994c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png new file mode 100644 index 000000000..8856c70df Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 9cd050100..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png deleted file mode 100644 index ae48a3bf7..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png new file mode 100644 index 000000000..c49d420e0 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index 529a7724b..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png deleted file mode 100644 index cf149aa37..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png new file mode 100644 index 000000000..db080df4e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png deleted file mode 100644 index a0fe0156f..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png deleted file mode 100644 index 7460e0894..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml deleted file mode 100644 index c3e31bf11..000000000 --- a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml new file mode 100644 index 000000000..465fd195e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 23b549660..e01f1c049 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -62,6 +62,8 @@ "Files" "Text" "Certificates" + "Encrypt" + "Decrypt" "Decrypt, verify, and save file" @@ -82,9 +84,11 @@ "Create key" "Add file(s)" "Share decrypted text" - "Decrypt from clipboard" + "Decrypt text from clipboard" "and verify signatures" "Decrypt files" + "Encrypt files" + "Encrypt text" "Settings" @@ -584,9 +588,7 @@ "Keys" - "Encrypt text" - "Encrypt files" - "Decrypt" + "Encrypt/Decrypt" "Apps" "Open navigation drawer" "Close navigation drawer" -- cgit v1.2.3