Skip to content

Commit fb51fc6

Browse files
authored
#3408 Refactoring the FileProcessor and GPSExtractor classes (#3543)
* #3408 Refactoring the FileProcessor and GPSExtractor classes - refactor FileProcessor * #3408 Refactoring the FileProcessor and GPSExtractor classes - refactor and rename GpsExtractor * #3408 Refactoring the FileProcessor and GPSExtractor classes - convert ImageCoordinates to kotlin * #3408 Refactoring the FileProcessor and GPSExtractor classes - convert FileProcessor to kotlin * #3408 Refactoring the FileProcessor and GPSExtractor classes - minor reformatting * #3408 Refactoring the FileProcessor and GPSExtractor classes - fix compilation and naming issues * #3408 Refactoring the FileProcessor and GPSExtractor classes - remove empty test * #3408 Refactoring the FileProcessor and GPSExtractor classes - set coordinates for upload item if user chooses it
1 parent efc6fa6 commit fb51fc6

17 files changed

+449
-833
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,13 @@
22

33
import android.app.Activity;
44
import android.content.ContentProviderClient;
5+
import android.content.ContentResolver;
56
import android.content.Context;
67
import android.view.inputmethod.InputMethodManager;
7-
88
import androidx.collection.LruCache;
99
import androidx.room.Room;
10-
1110
import com.github.varunpant.quadtree.QuadTree;
1211
import com.google.gson.Gson;
13-
14-
import org.wikipedia.AppAdapter;
15-
16-
import java.util.ArrayList;
17-
import java.util.HashMap;
18-
import java.util.List;
19-
import java.util.Map;
20-
import java.util.Objects;
21-
22-
import javax.inject.Named;
23-
import javax.inject.Singleton;
24-
2512
import dagger.Module;
2613
import dagger.Provides;
2714
import fr.free.nrw.commons.BuildConfig;
@@ -41,10 +28,18 @@
4128
import io.reactivex.Scheduler;
4229
import io.reactivex.android.schedulers.AndroidSchedulers;
4330
import io.reactivex.schedulers.Schedulers;
31+
import java.util.ArrayList;
32+
import java.util.HashMap;
33+
import java.util.List;
34+
import java.util.Map;
35+
import java.util.Objects;
36+
import javax.inject.Named;
37+
import javax.inject.Singleton;
38+
import org.wikipedia.AppAdapter;
4439

4540
/**
46-
* The Dependency Provider class for Commons Android.
47-
*
41+
* The Dependency Provider class for Commons Android.
42+
*
4843
* Provides all sorts of ContentProviderClients used by the app
4944
* along with the Liscences, AccountUtility, UploadController, Logged User,
5045
* Location manager etc
@@ -101,7 +96,7 @@ public AccountUtil providesAccountUtil(Context context) {
10196
}
10297

10398
/**
104-
* Provides an instance of CategoryContentProviderClient i.e. the categories
99+
* Provides an instance of CategoryContentProviderClient i.e. the categories
105100
* that are there in local storage
106101
*/
107102
@Provides
@@ -203,7 +198,7 @@ public boolean provideIsBetaVariant() {
203198

204199
/**
205200
* Provide JavaRx IO scheduler which manages IO operations
206-
* across various Threads
201+
* across various Threads
207202
*/
208203
@Named(IO_THREAD)
209204
@Provides
@@ -244,4 +239,9 @@ public AppDatabase provideAppDataBase() {
244239
public ContributionDao providesContributionsDao() {
245240
return appDatabase.getContributionDao();
246241
}
247-
}
242+
243+
@Provides
244+
public ContentResolver providesContentResolver(Context context){
245+
return context.getContentResolver();
246+
}
247+
}

app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fr.free.nrw.commons.repository;
22

3+
import fr.free.nrw.commons.upload.ImageCoordinates;
34
import java.io.IOException;
45
import java.util.Comparator;
56
import java.util.List;
@@ -202,4 +203,8 @@ public Place getNearbyPlaces(double latitude, double longitude) {
202203
return null;
203204
}
204205
}
206+
207+
public void useSimilarPictureCoordinates(ImageCoordinates imageCoordinates, int uploadItemIndex) {
208+
uploadModel.useSimilarPictureCoordinates(imageCoordinates, uploadItemIndex);
209+
}
205210
}

app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fr.free.nrw.commons.repository;
22

3+
import fr.free.nrw.commons.upload.ImageCoordinates;
34
import java.util.Comparator;
45
import java.util.List;
56

@@ -271,4 +272,8 @@ public void setSelectedLicense(String licenseName) {
271272
public Place checkNearbyPlaces(double decLatitude, double decLongitude) {
272273
return remoteDataSource.getNearbyPlaces(decLatitude, decLongitude);
273274
}
275+
276+
public void useSimilarPictureCoordinates(ImageCoordinates imageCoordinates, int uploadItemIndex) {
277+
remoteDataSource.useSimilarPictureCoordinates(imageCoordinates, uploadItemIndex);
278+
}
274279
}

app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java

Lines changed: 0 additions & 245 deletions
This file was deleted.

0 commit comments

Comments
 (0)