Remove unused functionality from StorageManager and StorageProvider (be7a7132) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -6,9 +6,6 @@ interface CoreResourceProvider {
		fun defaultSignature(): String
		fun defaultIdentityDescription(): String

		fun internalStorageProviderName(): String
		fun externalStorageProviderName(): String

		fun contactDisplayNamePrefix(): String
		fun contactUnknownSender(): String
		fun contactUnknownRecipient(): String

app/core/src/main/java/com/fsck/k9/mailstore/StorageManager.java

+8 −46

Original line number	Diff line number	Diff line
		@@ -6,13 +6,11 @@ import java.util.Arrays;
		import java.util.LinkedHashMap;
		import java.util.List;
		import java.util.Map;
		import java.util.Set;

		import android.content.Context;
		import android.os.Environment;

		import com.fsck.k9.CoreResourceProvider;
		import com.fsck.k9.DI;


		/**
		* Manager for different {@link StorageProvider} -classes that abstract access to sd-cards, additional internal memory
		@@ -54,12 +52,6 @@ public class StorageManager {
		*/
		void init(Context context);

		/**
		* @param context Never <code>null</code>.
		* @return A user displayable, localized name for this provider. Never
		* <code>null</code>.
		*/
		String getName(Context context);

		/**
		* Some implementations may not be able to return valid File handles because the device doesn't provide the
		@@ -109,11 +101,6 @@ public class StorageManager {
		public static class InternalStorageProvider implements StorageProvider {
		public static final String ID = "InternalStorage";

		private final CoreResourceProvider resourceProvider;

		public InternalStorageProvider(CoreResourceProvider resourceProvider) {
		this.resourceProvider = resourceProvider;
		}

		@Override
		public String getId() {
		@@ -125,11 +112,6 @@ public class StorageManager {

		}

		@Override
		public String getName(Context context) {
		return resourceProvider.internalStorageProviderName();
		}

		@Override
		public boolean isSupported(Context context) {
		return true;
		@@ -167,7 +149,6 @@ public class StorageManager {
		public static class ExternalStorageProvider implements StorageProvider {
		public static final String ID = "ExternalStorage";

		private final CoreResourceProvider resourceProvider;

		/**
		* Chosen base directory.
		@@ -175,10 +156,6 @@ public class StorageManager {
		private File mApplicationDirectory;


		public ExternalStorageProvider(CoreResourceProvider resourceProvider) {
		this.resourceProvider = resourceProvider;
		}

		@Override
		public String getId() {
		return ID;
		@@ -189,11 +166,6 @@ public class StorageManager {
		mApplicationDirectory = context.getExternalFilesDir(null);
		}

		@Override
		public String getName(Context context) {
		return resourceProvider.externalStorageProviderName();
		}

		@Override
		public boolean isSupported(Context context) {
		return true;
		@@ -225,8 +197,7 @@ public class StorageManager {
		public static synchronized StorageManager getInstance(final Context context) {
		if (instance == null) {
		Context applicationContext = context.getApplicationContext();
		CoreResourceProvider resourceProvider = DI.get(CoreResourceProvider.class);
		instance = new StorageManager(applicationContext, resourceProvider);
		instance = new StorageManager(applicationContext);
		}
		return instance;
		}
		@@ -236,7 +207,7 @@ public class StorageManager {
		* @param context Never <code>null</code>.
		* @throws NullPointerException If <tt>context</tt> is <code>null</code>.
		*/
		protected StorageManager(final Context context, CoreResourceProvider resourceProvider) throws NullPointerException {
		protected StorageManager(final Context context) throws NullPointerException {
		if (context == null) {
		throw new NullPointerException("No Context given");
		}
		@@ -253,8 +224,9 @@ public class StorageManager {
		* be considered as the default provider !!!
		*/
		final List<StorageProvider> allProviders = Arrays.asList(
		new InternalStorageProvider(resourceProvider),
		new ExternalStorageProvider(resourceProvider));
		new InternalStorageProvider(),
		new ExternalStorageProvider()
		);
		for (final StorageProvider provider : allProviders) {
		// check for provider compatibility
		if (provider.isSupported(context)) {
		@@ -306,17 +278,7 @@ public class StorageManager {
		}


		/**
		* @return A map of available providers names, indexed by their ID. Never
		* <code>null</code>.
		* @see StorageManager
		* @see StorageProvider#isSupported(Context)
		*/
		public Map<String, String> getAvailableProviders() {
		final Map<String, String> result = new LinkedHashMap<>();
		for (final Map.Entry<String, StorageProvider> entry : mProviders.entrySet()) {
		result.put(entry.getKey(), entry.getValue().getName(context));
		}
		return result;
		public Set<String> getAvailableProviders() {
		return mProviders.keySet();
		}
		}

app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -413,8 +413,8 @@ public class AccountSettingsDescriptions {
		@Override
		public String fromString(String value) {
		StorageManager storageManager = StorageManager.getInstance(context);
		Map<String, String> providers = storageManager.getAvailableProviders();
		if (providers.containsKey(value)) {
		Set<String> providers = storageManager.getAvailableProviders();
		if (providers.contains(value)) {
		return value;
		}
		throw new RuntimeException("Validation failed");
		@@ -453,7 +453,7 @@ public class AccountSettingsDescriptions {

		/**
		* Upgrades settings from version 52 to 53
		*
		* <p>
		* Replace folder entries of "-NONE-" with {@code null}.
		*/
		private static class SettingsUpgraderV53 implements SettingsUpgrader {
		@@ -481,7 +481,7 @@ public class AccountSettingsDescriptions {

		/**
		* Upgrades settings from version 53 to 54
		*
		* <p>
		* Inserts folder selection entries with a value of "MANUAL"
		*/
		private static class SettingsUpgraderV54 implements SettingsUpgrader {
		@@ -501,7 +501,7 @@ public class AccountSettingsDescriptions {

		/**
		* Upgrades settings from version 73 to 74
		*
		* <p>
		* Rewrites 'idleRefreshMinutes' from '1' to '2' if necessary
		*/
		private static class SettingsUpgraderV74 implements SettingsUpgrader {

app/core/src/test/java/com/fsck/k9/TestCoreResourceProvider.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -7,14 +7,6 @@ class TestCoreResourceProvider : CoreResourceProvider {

		override fun defaultIdentityDescription() = "initial identity"

		override fun internalStorageProviderName(): String {
		throw UnsupportedOperationException("not implemented")
		}

		override fun externalStorageProviderName(): String {
		throw UnsupportedOperationException("not implemented")
		}

		override fun contactDisplayNamePrefix() = "To:"
		override fun contactUnknownSender() = "<Unknown Sender>"
		override fun contactUnknownRecipient() = "<Unknown Recipient>"

app/k9mail-jmap/src/main/java/com/fsck/k9/resources/K9CoreResourceProvider.kt

+0 −5

Original line number	Diff line number	Diff line
		@@ -9,11 +9,6 @@ class K9CoreResourceProvider(private val context: Context) : CoreResourceProvide
		override fun defaultSignature(): String = context.getString(R.string.default_signature)
		override fun defaultIdentityDescription(): String = context.getString(R.string.default_identity_description)

		override fun internalStorageProviderName(): String =
		context.getString(R.string.local_storage_provider_internal_label)

		override fun externalStorageProviderName(): String =
		context.getString(R.string.local_storage_provider_external_label)

		override fun contactDisplayNamePrefix(): String = context.getString(R.string.message_to_label)
		override fun contactUnknownSender(): String = context.getString(R.string.unknown_sender)