Skip to content

Commit 386d087

Browse files
ilgazerashishkumar468
authored andcommitted
Deleted unused classes related to modification (commons-app#3084)
Removed ModificationsSyncAdapter
1 parent 75f3098 commit 386d087

14 files changed

+4
-872
lines changed

app/src/main/AndroidManifest.xml

+1-17
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,6 @@
162162
android:name="android.content.SyncAdapter"
163163
android:resource="@xml/contributions_sync_adapter" />
164164
</service>
165-
<service
166-
android:name=".modifications.ModificationsSyncService"
167-
android:exported="true">
168-
<intent-filter>
169-
<action android:name="android.content.SyncAdapter" />
170-
</intent-filter>
171-
172-
<meta-data
173-
android:name="android.content.SyncAdapter"
174-
android:resource="@xml/modifications_sync_adapter" />
175-
</service>
176165

177166
<service
178167
android:name="org.acra.sender.SenderService"
@@ -194,12 +183,7 @@
194183
android:exported="false"
195184
android:label="@string/provider_contributions"
196185
android:syncable="true" />
197-
<provider
198-
android:name=".modifications.ModificationsContentProvider"
199-
android:authorities="${applicationId}.modifications.contentprovider"
200-
android:exported="false"
201-
android:label="@string/provider_modifications"
202-
android:syncable="true" />
186+
203187
<provider
204188
android:name=".category.CategoryContentProvider"
205189
android:authorities="${applicationId}.categories.contentprovider"

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import android.os.Process;
1111
import android.util.Log;
1212

13+
import androidx.annotation.NonNull;
14+
1315
import com.facebook.drawee.backends.pipeline.Fresco;
1416
import com.facebook.imagepipeline.core.ImagePipelineConfig;
1517
import com.squareup.leakcanary.LeakCanary;
@@ -28,7 +30,6 @@
2830
import javax.inject.Inject;
2931
import javax.inject.Named;
3032

31-
import androidx.annotation.NonNull;
3233
import fr.free.nrw.commons.auth.SessionManager;
3334
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
3435
import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
@@ -41,7 +42,6 @@
4142
import fr.free.nrw.commons.kvstore.JsonKvStore;
4243
import fr.free.nrw.commons.logging.FileLoggingTree;
4344
import fr.free.nrw.commons.logging.LogUtils;
44-
import fr.free.nrw.commons.modifications.ModifierSequenceDao;
4545
import fr.free.nrw.commons.upload.FileUtils;
4646
import fr.free.nrw.commons.utils.ConfigUtils;
4747
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -265,7 +265,6 @@ private void updateAllDatabases() {
265265
dbOpenHelper.getReadableDatabase().close();
266266
SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
267267

268-
ModifierSequenceDao.Table.onDelete(db);
269268
CategoryDao.Table.onDelete(db);
270269
ContributionDao.Table.onDelete(db);
271270
BookmarkPicturesDao.Table.onDelete(db);

app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import fr.free.nrw.commons.category.CategoryDao;
1010
import fr.free.nrw.commons.contributions.ContributionDao;
1111
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao;
12-
import fr.free.nrw.commons.modifications.ModifierSequenceDao;
1312

1413
public class DBOpenHelper extends SQLiteOpenHelper {
1514

@@ -27,7 +26,6 @@ public DBOpenHelper(Context context) {
2726
@Override
2827
public void onCreate(SQLiteDatabase sqLiteDatabase) {
2928
ContributionDao.Table.onCreate(sqLiteDatabase);
30-
ModifierSequenceDao.Table.onCreate(sqLiteDatabase);
3129
CategoryDao.Table.onCreate(sqLiteDatabase);
3230
BookmarkPicturesDao.Table.onCreate(sqLiteDatabase);
3331
BookmarkLocationsDao.Table.onCreate(sqLiteDatabase);
@@ -37,7 +35,6 @@ public void onCreate(SQLiteDatabase sqLiteDatabase) {
3735
@Override
3836
public void onUpgrade(SQLiteDatabase sqLiteDatabase, int from, int to) {
3937
ContributionDao.Table.onUpdate(sqLiteDatabase, from, to);
40-
ModifierSequenceDao.Table.onUpdate(sqLiteDatabase, from, to);
4138
CategoryDao.Table.onUpdate(sqLiteDatabase, from, to);
4239
BookmarkPicturesDao.Table.onUpdate(sqLiteDatabase, from, to);
4340
BookmarkLocationsDao.Table.onUpdate(sqLiteDatabase, from, to);

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package fr.free.nrw.commons.di;
22

3-
import fr.free.nrw.commons.contributions.ContributionsModule;
43
import javax.inject.Singleton;
54

65
import dagger.Component;
@@ -10,8 +9,8 @@
109
import fr.free.nrw.commons.CommonsApplication;
1110
import fr.free.nrw.commons.auth.LoginActivity;
1211
import fr.free.nrw.commons.contributions.ContributionViewHolder;
12+
import fr.free.nrw.commons.contributions.ContributionsModule;
1313
import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
14-
import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
1514
import fr.free.nrw.commons.nearby.PlaceRenderer;
1615
import fr.free.nrw.commons.review.ReviewController;
1716
import fr.free.nrw.commons.settings.SettingsFragment;
@@ -36,8 +35,6 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
3635

3736
void inject(ContributionsSyncAdapter syncAdapter);
3837

39-
void inject(ModificationsSyncAdapter syncAdapter);
40-
4138
void inject(LoginActivity activity);
4239

4340
void inject(SettingsFragment fragment);

app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java

-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import fr.free.nrw.commons.category.CategoryContentProvider;
88
import fr.free.nrw.commons.contributions.ContributionsContentProvider;
99
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider;
10-
import fr.free.nrw.commons.modifications.ModificationsContentProvider;
1110

1211
@Module
1312
@SuppressWarnings({"WeakerAccess", "unused"})
@@ -16,9 +15,6 @@ public abstract class ContentProviderBuilderModule {
1615
@ContributesAndroidInjector
1716
abstract ContributionsContentProvider bindContributionsContentProvider();
1817

19-
@ContributesAndroidInjector
20-
abstract ModificationsContentProvider bindModificationsContentProvider();
21-
2218
@ContributesAndroidInjector
2319
abstract CategoryContentProvider bindCategoryContentProvider();
2420

app/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java

-48
This file was deleted.

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

-161
This file was deleted.

0 commit comments

Comments
 (0)