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

instrument: add test for empty clipboard, fix empty clipboard error

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-30 15:37:02 +02:00
parent f1c0c3e00c
commit 473866baaf
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/MiscCryptOperationTests.java
View File

@@ -23,6 +23,9 @@ import java.io.File;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.app.Instrumentation.ActivityResult; import android.app.Instrumentation.ActivityResult;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
@@ -143,6 +146,18 @@ public class MiscCryptOperationTests {
} }
@Test
public void testDecryptEmptyClipboard() throws Exception {
// decrypt any non-pgp file
ClipboardManager clipboard = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(ClipData.newPlainText("", ""));
onView(withId(R.id.decrypt_from_clipboard)).perform(click());
checkSnackbar(Style.ERROR, R.string.error_clipboard_empty);
}
@Test @Test
public void testDecryptNonPgpClipboard() throws Exception { public void testDecryptNonPgpClipboard() throws Exception {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
View File

@@ -29,6 +29,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -108,8 +109,9 @@ public class EncryptDecryptOverviewFragment extends Fragment {
} }
final CharSequence clipboardText = ClipboardReflection.getClipboardText(activity); final CharSequence clipboardText = ClipboardReflection.getClipboardText(activity);
if (clipboardText == null) { if (clipboardText == null || TextUtils.isEmpty(clipboardText)) {
Notify.create(activity, R.string.error_clipboard_empty, Style.ERROR); Notify.create(activity, R.string.error_clipboard_empty, Style.ERROR).show();
return;
} }
Intent clipboardDecrypt = new Intent(getActivity(), DecryptActivity.class); Intent clipboardDecrypt = new Intent(getActivity(), DecryptActivity.class);