mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactoring based on comments

Browse source
This commit is contained in:
maskara 2018-01-13 23:59:45 +05:30
parent e1afa6081e
commit eb3e448452
17 changed files with 51 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/HandlerService.java
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons; package fr.free.nrw.commons;
import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.Binder; import android.os.Binder;
import android.os.Handler; import android.os.Handler;
@ -9,11 +8,9 @@ import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import dagger.android.AndroidInjection; import fr.free.nrw.commons.di.CommonsDaggerService;
import dagger.android.DaggerService;
import fr.free.nrw.commons.di.FixedDaggerService;
public abstract class HandlerService<T> extends FixedDaggerService { public abstract class HandlerService<T> extends CommonsDaggerService {
private volatile Looper threadLooper; private volatile Looper threadLooper;
private volatile ServiceHandler threadHandler; private volatile ServiceHandler threadHandler;
private String serviceName; private String serviceName;

7
app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
View file

@ -1,19 +1,16 @@
package fr.free.nrw.commons.auth; package fr.free.nrw.commons.auth;
import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
import javax.inject.Inject; import javax.inject.Inject;
import dagger.android.AndroidInjection; import fr.free.nrw.commons.di.CommonsDaggerService;
import dagger.android.DaggerService;
import fr.free.nrw.commons.di.FixedDaggerService;
import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.mwapi.MediaWikiApi;
import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT; import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT;
public class WikiAccountAuthenticatorService extends FixedDaggerService { public class WikiAccountAuthenticatorService extends CommonsDaggerService {
@Inject MediaWikiApi mwApi; @Inject MediaWikiApi mwApi;
private WikiAccountAuthenticator wikiAccountAuthenticator = null; private WikiAccountAuthenticator wikiAccountAuthenticator = null;

4
app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -35,7 +35,7 @@ import javax.inject.Named;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.R; 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.mwapi.MediaWikiApi;
import fr.free.nrw.commons.upload.MwVolleyApi; import fr.free.nrw.commons.upload.MwVolleyApi;
import fr.free.nrw.commons.utils.StringSortingUtils; 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. * 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; public static final int SEARCH_CATS_LIMIT = 25;

17
app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons.category; package fr.free.nrw.commons.category;
import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
@ -12,10 +11,8 @@ import android.text.TextUtils;
import javax.inject.Inject; import javax.inject.Inject;
import dagger.Lazy;
import dagger.android.AndroidInjection;
import fr.free.nrw.commons.data.DBOpenHelper; 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 timber.log.Timber;
import static android.content.UriMatcher.NO_MATCH; 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.COLUMN_ID;
import static fr.free.nrw.commons.category.CategoryDao.Table.TABLE_NAME; 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"; public static final String AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
// For URI matcher // For URI matcher
@ -44,7 +41,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider {
return Uri.parse(BASE_URI.toString() + "/" + id); return Uri.parse(BASE_URI.toString() + "/" + id);
} }
@Inject Lazy<DBOpenHelper> dbOpenHelper; @Inject DBOpenHelper dbOpenHelper;
@Override @Override
public boolean onCreate() { public boolean onCreate() {
@ -61,7 +58,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider {
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
Cursor cursor; Cursor cursor;
switch (uriType) { switch (uriType) {
@ -97,7 +94,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider {
@Override @Override
public Uri insert(@NonNull Uri uri, ContentValues contentValues) { public Uri insert(@NonNull Uri uri, ContentValues contentValues) {
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
long id; long id;
switch (uriType) { switch (uriType) {
case CATEGORIES: case CATEGORIES:
@ -120,7 +117,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider {
public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) { public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) {
Timber.d("Hello, bulk insert! (CategoryContentProvider)"); Timber.d("Hello, bulk insert! (CategoryContentProvider)");
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
sqlDB.beginTransaction(); sqlDB.beginTransaction();
switch (uriType) { switch (uriType) {
case CATEGORIES: case CATEGORIES:
@ -152,7 +149,7 @@ public class CategoryContentProvider extends FixedDaggerContentProvider {
and will error out otherwise. and will error out otherwise.
*/ */
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
int rowsUpdated; int rowsUpdated;
switch (uriType) { switch (uriType) {
case CATEGORIES_ID: case CATEGORIES_ID:

20
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons.contributions; package fr.free.nrw.commons.contributions;
import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
@ -12,17 +11,15 @@ import android.text.TextUtils;
import javax.inject.Inject; import javax.inject.Inject;
import dagger.Lazy;
import dagger.android.AndroidInjection;
import fr.free.nrw.commons.data.DBOpenHelper; 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 timber.log.Timber;
import static android.content.UriMatcher.NO_MATCH; 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.ALL_FIELDS;
import static fr.free.nrw.commons.contributions.ContributionDao.Table.TABLE_NAME; 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 = 1;
private static final int CONTRIBUTIONS_ID = 2; private static final int CONTRIBUTIONS_ID = 2;
@ -41,8 +38,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider {
return Uri.parse(BASE_URI.toString() + "/" + id); return Uri.parse(BASE_URI.toString() + "/" + id);
} }
@Inject @Inject DBOpenHelper dbOpenHelper;
Lazy<DBOpenHelper> dbOpenHelper;
@Override @Override
public boolean onCreate() { public boolean onCreate() {
@ -59,7 +55,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider {
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
Cursor cursor; Cursor cursor;
switch (uriType) { switch (uriType) {
@ -95,7 +91,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider {
@Override @Override
public Uri insert(@NonNull Uri uri, ContentValues contentValues) { public Uri insert(@NonNull Uri uri, ContentValues contentValues) {
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
long id = 0; long id = 0;
switch (uriType) { switch (uriType) {
case CONTRIBUTIONS: case CONTRIBUTIONS:
@ -114,7 +110,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider {
int rows; int rows;
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase db = dbOpenHelper.get().getReadableDatabase(); SQLiteDatabase db = dbOpenHelper.getReadableDatabase();
switch (uriType) { switch (uriType) {
case CONTRIBUTIONS_ID: case CONTRIBUTIONS_ID:
@ -136,7 +132,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider {
public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) { public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) {
Timber.d("Hello, bulk insert! (ContributionsContentProvider)"); Timber.d("Hello, bulk insert! (ContributionsContentProvider)");
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
sqlDB.beginTransaction(); sqlDB.beginTransaction();
switch (uriType) { switch (uriType) {
case CONTRIBUTIONS: case CONTRIBUTIONS:
@ -167,7 +163,7 @@ public class ContributionsContentProvider extends FixedDaggerContentProvider {
error out otherwise. error out otherwise.
*/ */
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
int rowsUpdated = 0; int rowsUpdated = 0;
switch (uriType) { switch (uriType) {
case CONTRIBUTIONS: case CONTRIBUTIONS:

13
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -1,13 +1,11 @@
package fr.free.nrw.commons.contributions; package fr.free.nrw.commons.contributions;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -27,10 +25,8 @@ import javax.inject.Named;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import dagger.android.support.AndroidSupportInjection;
import dagger.android.support.DaggerFragment;
import fr.free.nrw.commons.R; 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 fr.free.nrw.commons.nearby.NearbyActivity;
import timber.log.Timber; 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.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.view.View.GONE; import static android.view.View.GONE;
public class ContributionsListFragment extends FixedDaggerFragment { public class ContributionsListFragment extends CommonsDaggerSupportFragment {
@BindView(R.id.contributionsList) @BindView(R.id.contributionsList)
GridView contributionsList; GridView contributionsList;
@ -79,11 +75,6 @@ public class ContributionsListFragment extends FixedDaggerFragment {
return v; return v;
} }
@Override
public void onAttach(Context context) {
super.onAttach(context);
}
public ListAdapter getAdapter() { public ListAdapter getAdapter() {
return contributionsList.getAdapter(); return contributionsList.getAdapter();
} }

10
app/src/main/java/fr/free/nrw/commons/di/ApplicationContext.java
View file

@ -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 {}

18
app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java
View file

@ -29,18 +29,12 @@ public class ApplicationlessInjection
private static ApplicationlessInjection instance = null; private static ApplicationlessInjection instance = null;
@Inject @Inject DispatchingAndroidInjector<Activity> activityInjector;
DispatchingAndroidInjector<Activity> activityInjector; @Inject DispatchingAndroidInjector<BroadcastReceiver> broadcastReceiverInjector;
@Inject @Inject DispatchingAndroidInjector<android.app.Fragment> fragmentInjector;
DispatchingAndroidInjector<BroadcastReceiver> broadcastReceiverInjector; @Inject DispatchingAndroidInjector<Fragment> supportFragmentInjector;
@Inject @Inject DispatchingAndroidInjector<Service> serviceInjector;
DispatchingAndroidInjector<android.app.Fragment> fragmentInjector; @Inject DispatchingAndroidInjector<ContentProvider> contentProviderInjector;
@Inject
DispatchingAndroidInjector<Fragment> supportFragmentInjector;
@Inject
DispatchingAndroidInjector<Service> serviceInjector;
@Inject
DispatchingAndroidInjector<ContentProvider> contentProviderInjector;
private CommonsApplicationComponent commonsApplicationComponent; private CommonsApplicationComponent commonsApplicationComponent;

2
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerAppCompatActivity.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java
View file

@ -12,7 +12,7 @@ import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector; import dagger.android.DispatchingAndroidInjector;
import dagger.android.support.HasSupportFragmentInjector; import dagger.android.support.HasSupportFragmentInjector;
public abstract class FixedDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector { public abstract class CommonsDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector {
@Inject @Inject
DispatchingAndroidInjector<Fragment> supportFragmentInjector; DispatchingAndroidInjector<Fragment> supportFragmentInjector;

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerBroadcastReceiver.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java
View file

@ -6,9 +6,9 @@ import android.content.Intent;
import dagger.android.AndroidInjector; import dagger.android.AndroidInjector;
public abstract class FixedDaggerBroadcastReceiver extends BroadcastReceiver { public abstract class CommonsDaggerBroadcastReceiver extends BroadcastReceiver {
public FixedDaggerBroadcastReceiver() { public CommonsDaggerBroadcastReceiver() {
super(); super();
} }

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerContentProvider.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java
View file

@ -5,9 +5,9 @@ import android.content.ContentProvider;
import dagger.android.AndroidInjector; import dagger.android.AndroidInjector;
public abstract class FixedDaggerContentProvider extends ContentProvider { public abstract class CommonsDaggerContentProvider extends ContentProvider {
public FixedDaggerContentProvider() { public CommonsDaggerContentProvider() {
super(); super();
} }

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerIntentService.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java
View file

@ -5,9 +5,9 @@ import android.app.Service;
import dagger.android.AndroidInjector; 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); super(name);
} }

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerService.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java
View file

@ -4,9 +4,9 @@ import android.app.Service;
import dagger.android.AndroidInjector; import dagger.android.AndroidInjector;
public abstract class FixedDaggerService extends Service { public abstract class CommonsDaggerService extends Service {
public FixedDaggerService() { public CommonsDaggerService() {
super(); super();
} }

2
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerFragment.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java
View file

@ -10,7 +10,7 @@ import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector; import dagger.android.DispatchingAndroidInjector;
import dagger.android.support.HasSupportFragmentInjector; import dagger.android.support.HasSupportFragmentInjector;
public abstract class FixedDaggerFragment extends Fragment implements HasSupportFragmentInjector { public abstract class CommonsDaggerSupportFragment extends Fragment implements HasSupportFragmentInjector {
@Inject @Inject
DispatchingAndroidInjector<Fragment> childFragmentInjector; DispatchingAndroidInjector<Fragment> childFragmentInjector;

19
app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java
View file

@ -1,6 +1,5 @@
package fr.free.nrw.commons.modifications; package fr.free.nrw.commons.modifications;
import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
@ -12,15 +11,13 @@ import android.text.TextUtils;
import javax.inject.Inject; import javax.inject.Inject;
import dagger.Lazy;
import dagger.android.AndroidInjection;
import fr.free.nrw.commons.data.DBOpenHelper; 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 timber.log.Timber;
import static fr.free.nrw.commons.modifications.ModifierSequenceDao.Table.TABLE_NAME; 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 = 1;
private static final int MODIFICATIONS_ID = 2; private static final int MODIFICATIONS_ID = 2;
@ -40,7 +37,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider {
return Uri.parse(BASE_URI.toString() + "/" + id); return Uri.parse(BASE_URI.toString() + "/" + id);
} }
@Inject Lazy<DBOpenHelper> dbOpenHelper; @Inject DBOpenHelper dbOpenHelper;
@Override @Override
public boolean onCreate() { public boolean onCreate() {
@ -62,7 +59,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider {
throw new IllegalArgumentException("Unknown URI" + uri); 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 cursor = queryBuilder.query(db, projection, selection, selectionArgs, null, null, sortOrder);
cursor.setNotificationUri(getContext().getContentResolver(), uri); cursor.setNotificationUri(getContext().getContentResolver(), uri);
@ -78,7 +75,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider {
@Override @Override
public Uri insert(@NonNull Uri uri, ContentValues contentValues) { public Uri insert(@NonNull Uri uri, ContentValues contentValues) {
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
long id = 0; long id = 0;
switch (uriType) { switch (uriType) {
case MODIFICATIONS: case MODIFICATIONS:
@ -94,7 +91,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider {
@Override @Override
public int delete(@NonNull Uri uri, String s, String[] strings) { public int delete(@NonNull Uri uri, String s, String[] strings) {
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
switch (uriType) { switch (uriType) {
case MODIFICATIONS_ID: case MODIFICATIONS_ID:
String id = uri.getLastPathSegment(); String id = uri.getLastPathSegment();
@ -112,7 +109,7 @@ public class ModificationsContentProvider extends FixedDaggerContentProvider {
public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) { public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) {
Timber.d("Hello, bulk insert! (ModificationsContentProvider)"); Timber.d("Hello, bulk insert! (ModificationsContentProvider)");
int uriType = uriMatcher.match(uri); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
sqlDB.beginTransaction(); sqlDB.beginTransaction();
switch (uriType) { switch (uriType) {
case MODIFICATIONS: 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. 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); int uriType = uriMatcher.match(uri);
SQLiteDatabase sqlDB = dbOpenHelper.get().getWritableDatabase(); SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
int rowsUpdated = 0; int rowsUpdated = 0;
switch (uriType) { switch (uriType) {
case MODIFICATIONS: case MODIFICATIONS:

7
app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
View file

@ -3,14 +3,11 @@ package fr.free.nrw.commons.theme;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; 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.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; boolean currentTheme;
@Override @Override

12
app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
View file

@ -8,7 +8,6 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
@ -37,18 +36,16 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.OnItemSelected; import butterknife.OnItemSelected;
import butterknife.OnTouch; import butterknife.OnTouch;
import dagger.android.support.AndroidSupportInjection;
import dagger.android.support.DaggerFragment;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils; 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 fr.free.nrw.commons.settings.Prefs;
import timber.log.Timber; import timber.log.Timber;
import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.MotionEvent.ACTION_UP; 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.titleEdit) EditText titleEdit;
@BindView(R.id.descEdit) EditText descEdit; @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 @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {