Fix display of similar image fragment

Author: maskara

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

@@ -70,14 +70,14 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse {
     /**
      * Processes file coordinates, either from EXIF data or user location
      */
-    GPSExtractor processFileCoordinates() {
+    GPSExtractor processFileCoordinates(SimilarImageInterface similarImageInterface) {
         Timber.d("Calling GPSExtractor");
         imageObj = new GPSExtractor(exifInterface);
         decimalCoords = imageObj.getCoords();
         if (decimalCoords == null || !imageObj.imageCoordsExists) {
             //Find other photos taken around the same time which has gps coordinates
             if (!haveCheckedForOtherImages)
-                findOtherImages();// Do not do repeat the process
+                findOtherImages(similarImageInterface);// Do not do repeat the process
         } else {
             useImageCoords();
         }
@@ -91,8 +91,9 @@ String getDecimalCoords() {
 
     /**
      * Find other images around the same location that were taken within the last 20 sec
+     * @param similarImageInterface
      */
-    private void findOtherImages() {
+    private void findOtherImages(SimilarImageInterface similarImageInterface) {
         Timber.d("filePath" + filePath);
 
         long timeOfCreation = new File(filePath).lastModified();//Time when the original image was created
@@ -127,12 +128,7 @@ private void findOtherImages() {
                     if (tempImageObj.getCoords() != null && tempImageObj.imageCoordsExists) {
                         // Current image has gps coordinates and it's not current gps locaiton
                         Timber.d("This file has image coords:" + file.getAbsolutePath());
-                        SimilarImageDialogFragment newFragment = new SimilarImageDialogFragment();
-                        Bundle args = new Bundle();
-                        args.putString("originalImagePath", filePath);
-                        args.putString("possibleImagePath", file.getAbsolutePath());
-                        newFragment.setArguments(args);
-                        newFragment.show(((AppCompatActivity) context).getSupportFragmentManager(), "dialog");
+                        similarImageInterface.showSimilarImageFragment(filePath, file.getAbsolutePath());
                         break;
                     }
                 }

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

@@ -0,0 +1,5 @@
+package fr.free.nrw.commons.upload;
+
+public interface SimilarImageInterface {
+    void showSimilarImageFragment(String originalFilePath, String possibleFilePath);
+}

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

@@ -64,7 +64,7 @@
 
 import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
 
-public class UploadActivity extends AuthenticatedActivity implements UploadView {
+public class UploadActivity extends AuthenticatedActivity implements UploadView, SimilarImageInterface {
     @Inject InputMethodManager inputMethodManager;
     @Inject MediaWikiApi mwApi;
     @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
@@ -613,4 +613,14 @@ private void showInfoAlert(int titleStringID, int messageStringId, String... for
                 .create()
                 .show();
     }
+
+    @Override
+    public void showSimilarImageFragment(String originalFilePath, String possibleFilePath) {
+        SimilarImageDialogFragment newFragment = new SimilarImageDialogFragment();
+        Bundle args = new Bundle();
+        args.putString("originalImagePath", originalFilePath);
+        args.putString("possibleImagePath", possibleFilePath);
+        newFragment.setArguments(args);
+        newFragment.show(getSupportFragmentManager(), "dialog");
+    }
 }

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

@@ -77,14 +77,14 @@ public boolean isDummy() {
     }
 
     @SuppressLint("CheckResult")
-    public void receive(List<Uri> mediaUri, String mimeType, String source) {
+    public void receive(List<Uri> mediaUri, String mimeType, String source, SimilarImageInterface similarImageInterface) {
         currentStepIndex = 0;
         Observable<UploadItem> itemObservable = Observable.fromIterable(mediaUri)
                 .map(this::cacheFileUpload)
                 .map(filePath -> {
                     Uri uri = Uri.fromFile(new File(filePath));
                     FileProcessor fp = new FileProcessor(filePath, context.getContentResolver(), context);
-                    UploadItem item = new UploadItem(uri, mimeType, source, fp.processFileCoordinates(),
+                    UploadItem item = new UploadItem(uri, mimeType, source, fp.processFileCoordinates(similarImageInterface),
                             FileUtils.getFileExt(filePath), null);
                     Single.zip(
                             Single.fromCallable(() ->
@@ -107,13 +107,13 @@ public void receive(List<Uri> mediaUri, String mimeType, String source) {
     }
 
     @SuppressLint("CheckResult")
-    public void receiveDirect(Uri media, String mimeType, String source, String wikidataEntityIdPref, String title, String desc) {
+    public void receiveDirect(Uri media, String mimeType, String source, String wikidataEntityIdPref, String title, String desc, SimilarImageInterface similarImageInterface) {
         currentStepIndex = 0;
         items = new ArrayList<>();
         String filePath = this.cacheFileUpload(media);
         Uri uri = Uri.fromFile(new File(filePath));
         FileProcessor fp = new FileProcessor(filePath, context.getContentResolver(), context);
-        UploadItem item = new UploadItem(uri, mimeType, source, fp.processFileCoordinates(),
+        UploadItem item = new UploadItem(uri, mimeType, source, fp.processFileCoordinates(similarImageInterface),
                 FileUtils.getFileExt(filePath), wikidataEntityIdPref);
         item.title.setTitleText(title);
         item.descriptions.get(0).setDescriptionText(desc);

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

@@ -42,12 +42,14 @@ public class UploadPresenter {
     private final UploadController uploadController;
     private final MediaWikiApi mediaWikiApi;
 
-    private CompositeDisposable compositeDisposable;
-
     private static final UploadView DUMMY = (UploadView) Proxy.newProxyInstance(UploadView.class.getClassLoader(),
             new Class[]{UploadView.class}, (proxy, method, methodArgs) -> null);
     private UploadView view = DUMMY;
 
+    private static final SimilarImageInterface SIMILAR_IMAGE = (SimilarImageInterface) Proxy.newProxyInstance(SimilarImageInterface.class.getClassLoader(),
+            new Class[]{SimilarImageInterface.class}, (proxy, method, methodArgs) -> null);
+    private SimilarImageInterface similarImageInterface = SIMILAR_IMAGE;
+
     @UploadView.UploadPage int currentPage = UploadView.PLEASE_WAIT;
 
 
@@ -73,7 +75,7 @@ public void receive(Uri mediaUri, String mimeType, String source) {
      */
     @SuppressLint("CheckResult")
     public void receive(List<Uri> media, String mimeType, @Contribution.FileSource String source) {
-        Completable.fromRunnable(() -> uploadModel.receive(media, mimeType, source))
+        Completable.fromRunnable(() -> uploadModel.receive(media, mimeType, source, similarImageInterface))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(() -> {
@@ -94,7 +96,7 @@ public void receive(List<Uri> media, String mimeType, @Contribution.FileSource S
      */
     @SuppressLint("CheckResult")
     public void receiveDirect(Uri media, String mimeType, @Contribution.FileSource String source, String wikidataEntityIdPref, String title, String desc) {
-        Completable.fromRunnable(() -> uploadModel.receiveDirect(media, mimeType, source, wikidataEntityIdPref, title, desc))
+        Completable.fromRunnable(() -> uploadModel.receiveDirect(media, mimeType, source, wikidataEntityIdPref, title, desc, similarImageInterface))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(() -> {