Merge branch 'master' into improve-file-more

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java

6 files changed, 0 insertions, 174 deletions

diff --git a/OpenKeychain/src/test/java/tests/PgpDecryptVerifyTest.java b/OpenKeychain/src/test/java/tests/PgpDecryptVerifyTest.java
deleted file mode 100644
index d759bce05..000000000
--- a/OpenKeychain/src/test/java/tests/PgpDecryptVerifyTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package tests;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.*;
-import org.openintents.openpgp.OpenPgpSignatureResult;
-import org.sufficientlysecure.keychain.testsupport.PgpVerifyTestingHelper;
-
-@RunWith(RobolectricTestRunner.class)
-@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
-public class PgpDecryptVerifyTest {
-
-    @Test
-    public void testVerifySuccess() throws Exception {
-
-        String testFileName = "/sample.txt";
-        int expectedSignatureResult = OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED;
-
-        int status = new PgpVerifyTestingHelper(Robolectric.application).doTestFile(testFileName);
-
-        Assert.assertEquals(expectedSignatureResult, status);
-    }
-
-    @Test
-    public void testVerifyFailure() throws Exception {
-
-        String testFileName = "/sample-altered.txt";
-        int expectedSignatureResult = OpenPgpSignatureResult.SIGNATURE_ERROR;
-
-        int status = new PgpVerifyTestingHelper(Robolectric.application).doTestFile(testFileName);
-
-        Assert.assertEquals(expectedSignatureResult, status);
-    }
-
-}
diff --git a/OpenKeychain/src/test/java/tests/ProviderHelperKeyringTest.java b/OpenKeychain/src/test/java/tests/ProviderHelperKeyringTest.java
deleted file mode 100644
index 3d48c2f97..000000000
--- a/OpenKeychain/src/test/java/tests/ProviderHelperKeyringTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package tests;
-
-import java.util.Collections;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.ArrayList;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.*;
-import org.openintents.openpgp.OpenPgpSignatureResult;
-import org.sufficientlysecure.keychain.testsupport.KeyringTestingHelper;
-import org.sufficientlysecure.keychain.testsupport.PgpVerifyTestingHelper;
-
-@RunWith(RobolectricTestRunner.class)
-@org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19
-public class ProviderHelperKeyringTest {
-
-    @Test
-    public void testSavePublicKeyring() throws Exception {
-        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(Collections.singleton(
-                "/public-key-for-sample.blob"
-        )));
-    }
-
-    @Test
-    public void testSavePublicKeyringRsa() throws Exception {
-        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList(
-                        "000001-006.public_key",
-                        "000002-013.user_id",
-                        "000003-002.sig",
-                        "000004-012.ring_trust",
-                        "000005-002.sig",
-                        "000006-012.ring_trust",
-                        "000007-002.sig",
-                        "000008-012.ring_trust",
-                        "000009-002.sig",
-                        "000010-012.ring_trust",
-                        "000011-002.sig",
-                        "000012-012.ring_trust",
-                        "000013-014.public_subkey",
-                        "000014-002.sig",
-                        "000015-012.ring_trust"
-                ))));
-    }
-
-    @Test
-    public void testSavePublicKeyringDsa() throws Exception {
-        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList(
-                        "000016-006.public_key",
-                        "000017-002.sig",
-                        "000018-012.ring_trust",
-                        "000019-013.user_id",
-                        "000020-002.sig",
-                        "000021-012.ring_trust",
-                        "000022-002.sig",
-                        "000023-012.ring_trust",
-                        "000024-014.public_subkey",
-                        "000025-002.sig",
-                        "000026-012.ring_trust"
-                ))));
-    }
-
-    @Test
-    public void testSavePublicKeyringDsa2() throws Exception {
-        Assert.assertTrue(new KeyringTestingHelper(Robolectric.application).addKeyring(prependResourcePath(Arrays.asList(
-                        "000027-006.public_key",
-                        "000028-002.sig",
-                        "000029-012.ring_trust",
-                        "000030-013.user_id",
-                        "000031-002.sig",
-                        "000032-012.ring_trust",
-                        "000033-002.sig",
-                        "000034-012.ring_trust"
-                ))));
-    }
-
-    private static Collection<String> prependResourcePath(Collection<String> files) {
-        Collection<String> prependedFiles = new ArrayList<String>();
-        for (String file: files) {
-            prependedFiles.add("/extern/OpenPGP-Haskell/tests/data/" + file);
-        }
-        return prependedFiles;
-    }
-}
diff --git a/OpenKeychain/src/test/resources/extern/OpenPGP-Haskell b/OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
deleted file mode 160000
-Subproject eba7e4fdce3de6622b4ec3862b405b0acd01637
diff --git a/OpenKeychain/src/test/resources/public-key-for-sample.blob b/OpenKeychain/src/test/resources/public-key-for-sample.blob
deleted file mode 100644
index 4aa91510b..000000000
--- a/OpenKeychain/src/test/resources/public-key-for-sample.blob
+++ /dev/null
diff --git a/OpenKeychain/src/test/resources/sample-altered.txt b/OpenKeychain/src/test/resources/sample-altered.txt
deleted file mode 100644
index 458821f81..000000000
--- a/OpenKeychain/src/test/resources/sample-altered.txt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-This is a simple text document, which is used to illustrate
-the concept of signing simple text files.  There are no
-control characters or special formatting commands in this
-text, just simple printable ASCII characters.
-MALICIOUS TEXT
-To make this a slightly less uninteresting document, there
-follows a short shopping list.
-
-    eggs, 1 doz
-    milk, 1 gal
-    bacon, 1 lb
-    olive oil
-    bread, 1 loaf
-
-That's all there is to this document.
-
------BEGIN PGP SIGNATURE-----
-Version: PGPfreeware 5.5.5 for non-commercial use <http://www.nai.com>
-
-iQA/AwUBN78ib3S9RCOKzj55EQKqDACg1NV2/iyPKrDlOVJvJwz6ArcQ0UQAnjNC
-CDxKAFyaaGa835l1vpbFkAJk
-=3r/N
------END PGP SIGNATURE-----
diff --git a/OpenKeychain/src/test/resources/sample.txt b/OpenKeychain/src/test/resources/sample.txt
deleted file mode 100644
index c0065f78d..000000000
--- a/OpenKeychain/src/test/resources/sample.txt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-This is a simple text document, which is used to illustrate
-the concept of signing simple text files.  There are no
-control characters or special formatting commands in this
-text, just simple printable ASCII characters.
-
-To make this a slightly less uninteresting document, there
-follows a short shopping list.
-
-    eggs, 1 doz
-    milk, 1 gal
-    bacon, 1 lb
-    olive oil
-    bread, 1 loaf
-
-That's all there is to this document.
-
------BEGIN PGP SIGNATURE-----
-Version: PGPfreeware 5.5.5 for non-commercial use <http://www.nai.com>
-
-iQA/AwUBN78ib3S9RCOKzj55EQKqDACg1NV2/iyPKrDlOVJvJwz6ArcQ0UQAnjNC
-CDxKAFyaaGa835l1vpbFkAJk
-=3r/N
------END PGP SIGNATURE-----