diff options
Diffstat (limited to 'OpenKeychain')
13 files changed, 39 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index 7b2796c69..84315860c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -277,16 +277,19 @@ public class EncryptFilesFragment public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.encrypt_save: { + hideKeyboard(); mAfterEncryptAction = AfterEncryptAction.SAVE; cryptoOperation(); break; } case R.id.encrypt_share: { + hideKeyboard(); mAfterEncryptAction = AfterEncryptAction.SHARE; cryptoOperation(); break; } case R.id.encrypt_copy: { + hideKeyboard(); mAfterEncryptAction = AfterEncryptAction.COPY; cryptoOperation(); break; @@ -388,6 +391,9 @@ public class EncryptFilesFragment @Override public void onQueuedOperationSuccess(final SignEncryptResult result) { + super.onQueuedOperationSuccess(result); + + hideKeyboard(); // protected by Queueing*Fragment FragmentActivity activity = getActivity(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java index e307a85f8..7f49b14f8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java @@ -166,11 +166,13 @@ public class EncryptTextFragment // break; // } case R.id.encrypt_copy: { + hideKeyboard(); mShareAfterEncrypt = false; cryptoOperation(); break; } case R.id.encrypt_share: { + hideKeyboard(); mShareAfterEncrypt = true; cryptoOperation(); break; @@ -332,6 +334,9 @@ public class EncryptTextFragment @Override public void onQueuedOperationSuccess(SignEncryptResult result) { + super.onQueuedOperationSuccess(result); + + hideKeyboard(); if (mShareAfterEncrypt) { // Share encrypted message/file diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index bdcc0b82f..d00c8f367 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java @@ -254,12 +254,16 @@ public class MainActivity extends BaseNfcActivity implements FabContainer, OnBac // make sure the selected icon is the one shown at this point if (frag instanceof KeyListFragment) { + mToolbar.setTitle(R.string.app_name); mDrawerResult.setSelection(mDrawerResult.getPositionFromIdentifier(ID_KEYS), false); } else if (frag instanceof EncryptDecryptOverviewFragment) { + mToolbar.setTitle(R.string.nav_encrypt_decrypt); mDrawerResult.setSelection(mDrawerResult.getPositionFromIdentifier(ID_ENCRYPT_DECRYPT), false); } else if (frag instanceof AppsListFragment) { + mToolbar.setTitle(R.string.nav_apps); mDrawerResult.setSelection(mDrawerResult.getPositionFromIdentifier(ID_APPS), false); } else if (frag instanceof BackupFragment) { + mToolbar.setTitle(R.string.nav_backup); mDrawerResult.setSelection(mDrawerResult.getPositionFromIdentifier(ID_BACKUP), false); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java index 93838386c..fbab1959a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java @@ -187,6 +187,7 @@ public class KeyAdapter extends CursorAdapter { mCreationDate.setText(context.getString(R.string.label_key_created, dateTime)); + mCreationDate.setTextColor(context.getResources().getColor(textColor)); mCreationDate.setVisibility(View.VISIBLE); } else { mCreationDate.setVisibility(View.GONE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java index 9ce33f5a6..06361e8cb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java @@ -32,13 +32,11 @@ public abstract class CachingCryptoOperationFragment <T extends Parcelable, S ex @Override public void onQueuedOperationSuccess(S result) { - super.onCryptoOperationSuccess(result); mCachedActionsParcel = null; } @Override public void onQueuedOperationError(S result) { - super.onCryptoOperationError(result); mCachedActionsParcel = null; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java index e77a05dc2..c22566767 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java @@ -18,10 +18,13 @@ package org.sufficientlysecure.keychain.ui.base; +import android.content.Context; import android.content.Intent; import android.os.Parcelable; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.view.View; +import android.view.inputmethod.InputMethodManager; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.OperationResult; @@ -101,12 +104,25 @@ abstract class CryptoOperationFragment<T extends Parcelable, S extends Operation abstract public void onCryptoOperationSuccess(S result); @Override - public void onCryptoOperationError(S result) { - result.createNotify(getActivity()).show(); - } + abstract public void onCryptoOperationError(S result); @Override public void onCryptoOperationCancelled() { } + public void hideKeyboard() { + if (getActivity() == null) { + return; + } + InputMethodManager inputManager = (InputMethodManager) getActivity() + .getSystemService(Context.INPUT_METHOD_SERVICE); + + // check if no view has focus + View v = getActivity().getCurrentFocus(); + if (v == null) + return; + + inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0); + } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/QueueingCryptoOperationFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/QueueingCryptoOperationFragment.java index 65b0ac0de..9a88dcf31 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/QueueingCryptoOperationFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/QueueingCryptoOperationFragment.java @@ -69,7 +69,8 @@ public abstract class QueueingCryptoOperationFragment<T extends Parcelable, S ex public abstract void onQueuedOperationSuccess(S result); public void onQueuedOperationError(S result) { - super.onCryptoOperationError(result); + hideKeyboard(); + result.createNotify(getActivity()).show(); } @Override diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..4a9f76947 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..e2f5f3555 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..388b5b060 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..3fcdfdb55 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..8d322aa9b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml index 77d61788e..26bc9f98f 100644 --- a/OpenKeychain/src/main/res/menu/key_list_multi.xml +++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml @@ -9,8 +9,7 @@ <item android:id="@+id/menu_key_list_multi_delete" - android:showAsAction="never" - android:title="@string/menu_delete_key" - tools:ignore="AppCompatResource" /> + android:icon="@drawable/ic_delete_white_24dp" + android:title="@string/menu_delete_key" /> </menu> |
