From 7384fa7f2b4ff158e65cda787a58b64dc306691c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 15 Oct 2015 19:37:08 +0200 Subject: Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for db contract --- .../sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java | 4 ++-- .../org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenKeychain/src/androidTest') diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java index 498df7299..ba5eb7491 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/SymmetricTextOperationTests.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider; +import org.sufficientlysecure.keychain.provider.TemporaryFileProvider; import org.sufficientlysecure.keychain.ui.util.Notify.Style; import static android.support.test.InstrumentationRegistry.getInstrumentation; @@ -133,7 +133,7 @@ public class SymmetricTextOperationTests { hasExtra(equalTo(Intent.EXTRA_INTENT), allOf( hasAction(Intent.ACTION_VIEW), hasFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION), - hasData(allOf(hasScheme("content"), hasHost(TemporaryStorageProvider.AUTHORITY))), + hasData(allOf(hasScheme("content"), hasHost(TemporaryFileProvider.AUTHORITY))), hasType("text/plain") )) )).respondWith(new ActivityResult(Activity.RESULT_OK, null)); diff --git a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java index 63c7dc6de..edc5571fe 100644 --- a/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java +++ b/OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareTest.java @@ -34,7 +34,7 @@ import org.junit.runners.MethodSorters; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.compatibility.ClipboardReflection; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; -import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider; +import org.sufficientlysecure.keychain.provider.TemporaryFileProvider; import org.sufficientlysecure.keychain.ui.util.Notify.Style; import static android.support.test.espresso.Espresso.onView; @@ -96,7 +96,7 @@ public class ViewKeyAdvShareTest { hasType("text/plain"), hasExtra(is(Intent.EXTRA_TEXT), is("openpgp4fpr:c619d53f7a5f96f391a84ca79d604d2f310716a3")), hasExtra(is(Intent.EXTRA_STREAM), - allOf(hasScheme("content"), hasHost(TemporaryStorageProvider.AUTHORITY))) + allOf(hasScheme("content"), hasHost(TemporaryFileProvider.AUTHORITY))) )) )).respondWith(new ActivityResult(Activity.RESULT_OK, null)); onView(withId(R.id.view_key_action_fingerprint_share)).perform(click()); @@ -113,7 +113,7 @@ public class ViewKeyAdvShareTest { hasType("text/plain"), hasExtra(is(Intent.EXTRA_TEXT), startsWith("----")), hasExtra(is(Intent.EXTRA_STREAM), - allOf(hasScheme("content"), hasHost(TemporaryStorageProvider.AUTHORITY))) + allOf(hasScheme("content"), hasHost(TemporaryFileProvider.AUTHORITY))) )) )).respondWith(new ActivityResult(Activity.RESULT_OK, null)); onView(withId(R.id.view_key_action_key_share)).perform(click()); -- cgit v1.2.3