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

Inject prefs into FileProcessor instead of passing it from ShareActivity

Browse source
This commit is contained in:
misaochan 2018-05-29 19:12:45 +10:00
parent 82659316ff
commit c3e911f135
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named;
import fr.free.nrw.commons.caching.CacheController; import fr.free.nrw.commons.caching.CacheController;
import fr.free.nrw.commons.di.ApplicationlessInjection; import fr.free.nrw.commons.di.ApplicationlessInjection;
@ -34,7 +35,6 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{
private Uri mediaUri; private Uri mediaUri;
private ContentResolver contentResolver; private ContentResolver contentResolver;
private GPSExtractor imageObj; private GPSExtractor imageObj;
private SharedPreferences prefs;
private Context context; private Context context;
private String decimalCoords; private String decimalCoords;
private boolean haveCheckedForOtherImages = false; private boolean haveCheckedForOtherImages = false;
@ -49,11 +49,13 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{
GpsCategoryModel gpsCategoryModel; GpsCategoryModel gpsCategoryModel;
@Inject @Inject
CategoryApi apiCall; CategoryApi apiCall;
@Inject
@Named("default_preferences")
SharedPreferences prefs;
FileProcessor(Uri mediaUri, ContentResolver contentResolver, SharedPreferences prefs, Context context) { FileProcessor(Uri mediaUri, ContentResolver contentResolver, Context context) {
this.mediaUri = mediaUri; this.mediaUri = mediaUri;
this.contentResolver = contentResolver; this.contentResolver = contentResolver;
this.prefs = prefs;
this.context = context; this.context = context;
useExtStorage = prefs.getBoolean("useExternalStorage", true); useExtStorage = prefs.getBoolean("useExternalStorage", true);
ApplicationlessInjection.getInstance(context.getApplicationContext()).getCommonsApplicationComponent().inject(this); ApplicationlessInjection.getInstance(context.getApplicationContext()).getCommonsApplicationComponent().inject(this);

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

@ -1,12 +1,11 @@
package fr.free.nrw.commons.upload; package fr.free.nrw.commons.upload;
import android.Manifest; import android.Manifest;
import android.app.Activity;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet; import android.animation.AnimatorSet;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -305,7 +304,7 @@ public class ShareActivity
uploadController.prepareService(); uploadController.prepareService();
ContentResolver contentResolver = this.getContentResolver(); ContentResolver contentResolver = this.getContentResolver();
fileObj = new FileProcessor(mediaUri, contentResolver, prefs, this); fileObj = new FileProcessor(mediaUri, contentResolver, this);
checkIfFileExists(); checkIfFileExists();
fileObj.getFileCoordinates(locationPermitted); fileObj.getFileCoordinates(locationPermitted);
} }
@ -342,7 +341,7 @@ public class ShareActivity
isFABOpen=true; isFABOpen=true;
if( imageObj != null && imageObj.imageCoordsExists) if( imageObj != null && imageObj.imageCoordsExists)
mapButton.setVisibility(View.VISIBLE); mapButton.setVisibility(View.VISIBLE);
zoomInButton.setVisibility(View.VISIBLE); zoomInButton.setVisibility(View.VISIBLE);
mainFab.animate().rotationBy(180); mainFab.animate().rotationBy(180);

1
app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
View file

@ -11,7 +11,6 @@ import android.support.v4.graphics.BitmapCompat;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;