cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hide keyboard on crypto error/success

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-07-08 15:13:44 +02:00
parent eab46df9a3
commit d7a7c7310a
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@@ -388,6 +388,9 @@ public class EncryptFilesFragment
@Override
public void onQueuedOperationSuccess(final SignEncryptResult result) {
super.onQueuedOperationSuccess(result);
hideKeyboard();
// protected by Queueing*Fragment
FragmentActivity activity = getActivity();

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
View File

@@ -332,6 +332,9 @@ public class EncryptTextFragment
@Override
public void onQueuedOperationSuccess(SignEncryptResult result) {
super.onQueuedOperationSuccess(result);
hideKeyboard();
if (mShareAfterEncrypt) {
// Share encrypted message/file

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CachingCryptoOperationFragment.java
View File

@@ -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;
}

22
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
View File

@@ -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);
}
}

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/QueueingCryptoOperationFragment.java
View File

@@ -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