From bc8b29b71f37e4bf09caf394b85e7e247949a7e3 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 20 Mar 2020 11:29:36 +0000 Subject: [PATCH] #3222 remove lingering reference to depiction content provider --- app/build.gradle | 2 -- .../commons/di/CommonsApplicationModule.java | 28 ++++++------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index edc012144..52ee3fe1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -225,7 +225,6 @@ android { buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.contributions.contentprovider\"" buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.modifications.contentprovider\"" buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.categories.contentprovider\"" - buildConfigField "String", "DEPICTION_AUTHORITY", "\"fr.free.nrw.commons.depicts.contentprovider\"" buildConfigField "String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.explore.recentsearches.contentprovider\"" buildConfigField "String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.contentprovider\"" buildConfigField "String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.locations.contentprovider\"" @@ -260,7 +259,6 @@ android { buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.beta.contributions.contentprovider\"" buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.beta.modifications.contentprovider\"" buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.beta.categories.contentprovider\"" - buildConfigField "String", "DEPICTION_AUTHORITY", "\"fr.free.nrw.commons.beta.depicts.contentprovider\"" buildConfigField "String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.beta.explore.recentsearches.contentprovider\"" buildConfigField "String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.contentprovider\"" buildConfigField "String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.locations.contentprovider\"" diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java index 33217e957..e874f8b01 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java @@ -4,24 +4,10 @@ import android.app.Activity; import android.content.ContentProviderClient; import android.content.Context; import android.view.inputmethod.InputMethodManager; - import androidx.collection.LruCache; import androidx.room.Room; - import com.github.varunpant.quadtree.QuadTree; import com.google.gson.Gson; - -import org.wikipedia.AppAdapter; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import javax.inject.Named; -import javax.inject.Singleton; - import dagger.Module; import dagger.Provides; import fr.free.nrw.commons.BuildConfig; @@ -41,6 +27,14 @@ import fr.free.nrw.commons.wikidata.WikidataEditListenerImpl; import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import javax.inject.Named; +import javax.inject.Singleton; +import org.wikipedia.AppAdapter; /** * The Dependency Provider class for Commons Android. @@ -114,12 +108,6 @@ public class CommonsApplicationModule { * @param context context * @return DepictsContentProviderClient*/ - @Provides - @Named("depictions") - public ContentProviderClient provideDepictsContentProviderClient(Context context) { - return context.getContentResolver().acquireContentProviderClient(BuildConfig.DEPICTION_AUTHORITY); - } - /** * This method is used to provide instance of RecentSearchContentProviderClient * which provides content of Recent Searches from database