From eb3e4484525c9c0acdc0c325a905c649216006b9 Mon Sep 17 00:00:00 2001 From: maskara Date: Sat, 13 Jan 2018 23:59:45 +0530 Subject: [PATCH] Refactoring based on comments --- .../fr/free/nrw/commons/HandlerService.java | 7 ++----- .../auth/WikiAccountAuthenticatorService.java | 7 ++----- .../category/CategorizationFragment.java | 4 ++-- .../category/CategoryContentProvider.java | 17 +++++++--------- .../ContributionsContentProvider.java | 20 ++++++++----------- .../ContributionsListFragment.java | 13 ++---------- .../nrw/commons/di/ApplicationContext.java | 10 ---------- .../commons/di/ApplicationlessInjection.java | 18 ++++++----------- ...va => CommonsDaggerAppCompatActivity.java} | 2 +- ...va => CommonsDaggerBroadcastReceiver.java} | 4 ++-- ...java => CommonsDaggerContentProvider.java} | 4 ++-- ...e.java => CommonsDaggerIntentService.java} | 4 ++-- ...Service.java => CommonsDaggerService.java} | 4 ++-- ...java => CommonsDaggerSupportFragment.java} | 2 +- .../ModificationsContentProvider.java | 19 ++++++++---------- .../free/nrw/commons/theme/BaseActivity.java | 7 ++----- .../commons/upload/SingleUploadFragment.java | 12 ++--------- 17 files changed, 51 insertions(+), 103 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/di/ApplicationContext.java rename app/src/main/java/fr/free/nrw/commons/di/{FixedDaggerAppCompatActivity.java => CommonsDaggerAppCompatActivity.java} (90%) rename app/src/main/java/fr/free/nrw/commons/di/{FixedDaggerBroadcastReceiver.java => CommonsDaggerBroadcastReceiver.java} (85%) rename app/src/main/java/fr/free/nrw/commons/di/{FixedDaggerContentProvider.java => CommonsDaggerContentProvider.java} (84%) rename app/src/main/java/fr/free/nrw/commons/di/{FixedDaggerIntentService.java => CommonsDaggerIntentService.java} (84%) rename app/src/main/java/fr/free/nrw/commons/di/{FixedDaggerService.java => CommonsDaggerService.java} (86%) rename app/src/main/java/fr/free/nrw/commons/di/{FixedDaggerFragment.java => CommonsDaggerSupportFragment.java} (94%) diff --git a/app/src/main/java/fr/free/nrw/commons/HandlerService.java b/app/src/main/java/fr/free/nrw/commons/HandlerService.java index f8f9e62b7..e5e1b3b1b 100644 --- a/app/src/main/java/fr/free/nrw/commons/HandlerService.java +++ b/app/src/main/java/fr/free/nrw/commons/HandlerService.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons; -import android.app.Service; import android.content.Intent; import android.os.Binder; import android.os.Handler; @@ -9,11 +8,9 @@ import android.os.IBinder; import android.os.Looper; import android.os.Message; -import dagger.android.AndroidInjection; -import dagger.android.DaggerService; -import fr.free.nrw.commons.di.FixedDaggerService; +import fr.free.nrw.commons.di.CommonsDaggerService; -public abstract class HandlerService extends FixedDaggerService { +public abstract class HandlerService extends CommonsDaggerService { private volatile Looper threadLooper; private volatile ServiceHandler threadHandler; private String serviceName; diff --git a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java index d75696dbc..2e1e211f6 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java @@ -1,19 +1,16 @@ package fr.free.nrw.commons.auth; -import android.app.Service; import android.content.Intent; import android.os.IBinder; import javax.inject.Inject; -import dagger.android.AndroidInjection; -import dagger.android.DaggerService; -import fr.free.nrw.commons.di.FixedDaggerService; +import fr.free.nrw.commons.di.CommonsDaggerService; import fr.free.nrw.commons.mwapi.MediaWikiApi; import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT; -public class WikiAccountAuthenticatorService extends FixedDaggerService { +public class WikiAccountAuthenticatorService extends CommonsDaggerService { @Inject MediaWikiApi mwApi; private WikiAccountAuthenticator wikiAccountAuthenticator = null; diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index fdb7f390b..2fce53f8e 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -35,7 +35,7 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.di.FixedDaggerFragment; +import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.upload.MwVolleyApi; import fr.free.nrw.commons.utils.StringSortingUtils; @@ -50,7 +50,7 @@ import static android.view.KeyEvent.KEYCODE_BACK; /** * Displays the category suggestion and selection screen. Category search is initiated here. */ -public class CategorizationFragment extends FixedDaggerFragment { +public class CategorizationFragment extends CommonsDaggerSupportFragment { public static final int SEARCH_CATS_LIMIT = 25; diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java index 058082345..41148ca2a 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons.category; -import android.content.ContentProvider; import android.content.ContentValues; import android.content.UriMatcher; import android.database.Cursor; @@ -12,10 +11,8 @@ import android.text.TextUtils; import javax.inject.Inject; -import dagger.Lazy; -import dagger.android.AndroidInjection; import fr.free.nrw.commons.data.DBOpenHelper; -import fr.free.nrw.commons.di.FixedDaggerContentProvider; +import fr.free.nrw.commons.di.CommonsDaggerContentProvider; import timber.log.Timber; import static android.content.UriMatcher.NO_MATCH; @@ -23,7 +20,7 @@ import static fr.free.nrw.commons.category.CategoryDao.Table.ALL_FIELDS; import static fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_ID; import static fr.free.nrw.commons.category.CategoryDao.Table.TABLE_NAME; -public class CategoryContentProvider extends FixedDaggerContentProvider { +public class CategoryContentProvider extends CommonsDaggerContentProvider { public static final String AUTHORITY = "fr.free.nrw.commons.categories.contentprovider"; // For URI matcher @@ -44,7 +41,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider { return Uri.parse(BASE_URI.toString() + "/" + id); } - @Inject Lazy dbOpenHelper; + @Inject DBOpenHelper dbOpenHelper; @Override public boolean onCreate() { @@ -61,7 +58,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider { int uriType = uriMatcher.match(uri); - SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); Cursor cursor; switch (uriType) { @@ -97,7 +94,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider { @Override public Uri insert(@NonNull Uri uri, ContentValues contentValues) { int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); long id; switch (uriType) { case CATEGORIES: @@ -120,7 +117,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider { public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) { Timber.d("Hello, bulk insert! (CategoryContentProvider)"); int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); sqlDB.beginTransaction(); switch (uriType) { case CATEGORIES: @@ -152,7 +149,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider { and will error out otherwise. */ int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); int rowsUpdated; switch (uriType) { case CATEGORIES_ID: diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java index ca5475347..50c1f24f6 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons.contributions; -import android.content.ContentProvider; import android.content.ContentValues; import android.content.UriMatcher; import android.database.Cursor; @@ -12,17 +11,15 @@ import android.text.TextUtils; import javax.inject.Inject; -import dagger.Lazy; -import dagger.android.AndroidInjection; import fr.free.nrw.commons.data.DBOpenHelper; -import fr.free.nrw.commons.di.FixedDaggerContentProvider; +import fr.free.nrw.commons.di.CommonsDaggerContentProvider; import timber.log.Timber; import static android.content.UriMatcher.NO_MATCH; import static fr.free.nrw.commons.contributions.ContributionDao.Table.ALL_FIELDS; import static fr.free.nrw.commons.contributions.ContributionDao.Table.TABLE_NAME; -public class ContributionsContentProvider extends FixedDaggerContentProvider { +public class ContributionsContentProvider extends CommonsDaggerContentProvider { private static final int CONTRIBUTIONS = 1; private static final int CONTRIBUTIONS_ID = 2; @@ -41,8 +38,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider { return Uri.parse(BASE_URI.toString() + "/" + id); } - @Inject - Lazy dbOpenHelper; + @Inject DBOpenHelper dbOpenHelper; @Override public boolean onCreate() { @@ -59,7 +55,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider { int uriType = uriMatcher.match(uri); - SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); Cursor cursor; switch (uriType) { @@ -95,7 +91,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider { @Override public Uri insert(@NonNull Uri uri, ContentValues contentValues) { int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); long id = 0; switch (uriType) { case CONTRIBUTIONS: @@ -114,7 +110,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider { int rows; int uriType = uriMatcher.match(uri); - SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); switch (uriType) { case CONTRIBUTIONS_ID: @@ -136,7 +132,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider { public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) { Timber.d("Hello, bulk insert! (ContributionsContentProvider)"); int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); sqlDB.beginTransaction(); switch (uriType) { case CONTRIBUTIONS: @@ -167,7 +163,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider { error out otherwise. */ int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); int rowsUpdated = 0; switch (uriType) { case CONTRIBUTIONS: diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index f38e4e64b..3a391b293 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -1,13 +1,11 @@ package fr.free.nrw.commons.contributions; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; @@ -27,10 +25,8 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; -import dagger.android.support.AndroidSupportInjection; -import dagger.android.support.DaggerFragment; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.di.FixedDaggerFragment; +import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.nearby.NearbyActivity; import timber.log.Timber; @@ -40,7 +36,7 @@ import static android.app.Activity.RESULT_OK; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.view.View.GONE; -public class ContributionsListFragment extends FixedDaggerFragment { +public class ContributionsListFragment extends CommonsDaggerSupportFragment { @BindView(R.id.contributionsList) GridView contributionsList; @@ -79,11 +75,6 @@ public class ContributionsListFragment extends FixedDaggerFragment { return v; } - @Override - public void onAttach(Context context) { - super.onAttach(context); - } - public ListAdapter getAdapter() { return contributionsList.getAdapter(); } diff --git a/app/src/main/java/fr/free/nrw/commons/di/ApplicationContext.java b/app/src/main/java/fr/free/nrw/commons/di/ApplicationContext.java deleted file mode 100644 index 82f88ae3b..000000000 --- a/app/src/main/java/fr/free/nrw/commons/di/ApplicationContext.java +++ /dev/null @@ -1,10 +0,0 @@ -package fr.free.nrw.commons.di; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import javax.inject.Qualifier; - -@Qualifier -@Retention(RetentionPolicy.RUNTIME) -public @interface ApplicationContext {} \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java b/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java index 7ba35c47b..2faf09b83 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java +++ b/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java @@ -29,18 +29,12 @@ public class ApplicationlessInjection private static ApplicationlessInjection instance = null; - @Inject - DispatchingAndroidInjector activityInjector; - @Inject - DispatchingAndroidInjector broadcastReceiverInjector; - @Inject - DispatchingAndroidInjector fragmentInjector; - @Inject - DispatchingAndroidInjector supportFragmentInjector; - @Inject - DispatchingAndroidInjector serviceInjector; - @Inject - DispatchingAndroidInjector contentProviderInjector; + @Inject DispatchingAndroidInjector activityInjector; + @Inject DispatchingAndroidInjector broadcastReceiverInjector; + @Inject DispatchingAndroidInjector fragmentInjector; + @Inject DispatchingAndroidInjector supportFragmentInjector; + @Inject DispatchingAndroidInjector serviceInjector; + @Inject DispatchingAndroidInjector contentProviderInjector; private CommonsApplicationComponent commonsApplicationComponent; diff --git a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java similarity index 90% rename from app/src/main/java/fr/free/nrw/commons/di/FixedDaggerAppCompatActivity.java rename to app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java index 29388f62a..9f06725de 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerAppCompatActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java @@ -12,7 +12,7 @@ import dagger.android.AndroidInjector; import dagger.android.DispatchingAndroidInjector; import dagger.android.support.HasSupportFragmentInjector; -public abstract class FixedDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector { +public abstract class CommonsDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector { @Inject DispatchingAndroidInjector supportFragmentInjector; diff --git a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerBroadcastReceiver.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java similarity index 85% rename from app/src/main/java/fr/free/nrw/commons/di/FixedDaggerBroadcastReceiver.java rename to app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java index 4694e9893..3c4cb9914 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerBroadcastReceiver.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java @@ -6,9 +6,9 @@ import android.content.Intent; import dagger.android.AndroidInjector; -public abstract class FixedDaggerBroadcastReceiver extends BroadcastReceiver { +public abstract class CommonsDaggerBroadcastReceiver extends BroadcastReceiver { - public FixedDaggerBroadcastReceiver() { + public CommonsDaggerBroadcastReceiver() { super(); } diff --git a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerContentProvider.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java similarity index 84% rename from app/src/main/java/fr/free/nrw/commons/di/FixedDaggerContentProvider.java rename to app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java index 41dbc30c9..38506c4ca 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java @@ -5,9 +5,9 @@ import android.content.ContentProvider; import dagger.android.AndroidInjector; -public abstract class FixedDaggerContentProvider extends ContentProvider { +public abstract class CommonsDaggerContentProvider extends ContentProvider { - public FixedDaggerContentProvider() { + public CommonsDaggerContentProvider() { super(); } diff --git a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerIntentService.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java similarity index 84% rename from app/src/main/java/fr/free/nrw/commons/di/FixedDaggerIntentService.java rename to app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java index 3a1df1cfd..995c517a1 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerIntentService.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java @@ -5,9 +5,9 @@ import android.app.Service; import dagger.android.AndroidInjector; -public abstract class FixedDaggerIntentService extends IntentService { +public abstract class CommonsDaggerIntentService extends IntentService { - public FixedDaggerIntentService(String name) { + public CommonsDaggerIntentService(String name) { super(name); } diff --git a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerService.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java similarity index 86% rename from app/src/main/java/fr/free/nrw/commons/di/FixedDaggerService.java rename to app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java index b58f2273d..dc6c10b9f 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerService.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java @@ -4,9 +4,9 @@ import android.app.Service; import dagger.android.AndroidInjector; -public abstract class FixedDaggerService extends Service { +public abstract class CommonsDaggerService extends Service { - public FixedDaggerService() { + public CommonsDaggerService() { super(); } diff --git a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerFragment.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java similarity index 94% rename from app/src/main/java/fr/free/nrw/commons/di/FixedDaggerFragment.java rename to app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java index 7227d2a93..8c33e7a98 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/FixedDaggerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java @@ -10,7 +10,7 @@ import dagger.android.AndroidInjector; import dagger.android.DispatchingAndroidInjector; import dagger.android.support.HasSupportFragmentInjector; -public abstract class FixedDaggerFragment extends Fragment implements HasSupportFragmentInjector { +public abstract class CommonsDaggerSupportFragment extends Fragment implements HasSupportFragmentInjector { @Inject DispatchingAndroidInjector childFragmentInjector; diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java index c1decaca6..82361b602 100644 --- a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java +++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java @@ -1,6 +1,5 @@ package fr.free.nrw.commons.modifications; -import android.content.ContentProvider; import android.content.ContentValues; import android.content.UriMatcher; import android.database.Cursor; @@ -12,15 +11,13 @@ import android.text.TextUtils; import javax.inject.Inject; -import dagger.Lazy; -import dagger.android.AndroidInjection; import fr.free.nrw.commons.data.DBOpenHelper; -import fr.free.nrw.commons.di.FixedDaggerContentProvider; +import fr.free.nrw.commons.di.CommonsDaggerContentProvider; import timber.log.Timber; import static fr.free.nrw.commons.modifications.ModifierSequenceDao.Table.TABLE_NAME; -public class ModificationsContentProvider extends FixedDaggerContentProvider { +public class ModificationsContentProvider extends CommonsDaggerContentProvider { private static final int MODIFICATIONS = 1; private static final int MODIFICATIONS_ID = 2; @@ -40,7 +37,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider { return Uri.parse(BASE_URI.toString() + "/" + id); } - @Inject Lazy dbOpenHelper; + @Inject DBOpenHelper dbOpenHelper; @Override public boolean onCreate() { @@ -62,7 +59,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider { throw new IllegalArgumentException("Unknown URI" + uri); } - SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); + SQLiteDatabase db = dbOpenHelper.getReadableDatabase(); Cursor cursor = queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder); cursor.setNotificationUri(getContext().getContentResolver(), uri); @@ -78,7 +75,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider { @Override public Uri insert(@NonNull Uri uri, ContentValues contentValues) { int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); long id = 0; switch (uriType) { case MODIFICATIONS: @@ -94,7 +91,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider { @Override public int delete(@NonNull Uri uri, String s, String[] strings) { int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); switch (uriType) { case MODIFICATIONS_ID: String id = uri.getLastPathSegment(); @@ -112,7 +109,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider { public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) { Timber.d("Hello, bulk insert! (ModificationsContentProvider)"); int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); sqlDB.beginTransaction(); switch (uriType) { case MODIFICATIONS: @@ -140,7 +137,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider { In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise. */ int uriType = uriMatcher.match(uri); - SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); + SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase(); int rowsUpdated = 0; switch (uriType) { case MODIFICATIONS: diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java index 43b13dfd6..8ef8e84a4 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java @@ -3,14 +3,11 @@ package fr.free.nrw.commons.theme; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import dagger.android.AndroidInjection; -import dagger.android.support.DaggerAppCompatActivity; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.di.FixedDaggerAppCompatActivity; +import fr.free.nrw.commons.di.CommonsDaggerAppCompatActivity; -public abstract class BaseActivity extends FixedDaggerAppCompatActivity { +public abstract class BaseActivity extends CommonsDaggerAppCompatActivity { boolean currentTheme; @Override diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index b7faa31e9..be2401b5c 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -8,7 +8,6 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextWatcher; @@ -37,18 +36,16 @@ import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnItemSelected; import butterknife.OnTouch; -import dagger.android.support.AndroidSupportInjection; -import dagger.android.support.DaggerFragment; import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; -import fr.free.nrw.commons.di.FixedDaggerFragment; +import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.settings.Prefs; import timber.log.Timber; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_UP; -public class SingleUploadFragment extends FixedDaggerFragment { +public class SingleUploadFragment extends CommonsDaggerSupportFragment { @BindView(R.id.titleEdit) EditText titleEdit; @BindView(R.id.descEdit) EditText descEdit; @@ -70,11 +67,6 @@ public class SingleUploadFragment extends FixedDaggerFragment { } } - @Override - public void onAttach(Context context) { - super.onAttach(context); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) {