Feature/refractor uploads [WIP]

app/build.gradle

@@ -64,6 +64,8 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:3.7.1'
     testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
+    testImplementation "org.powermock:powermock-module-junit4:2.0.0-beta.5"
+    testImplementation "org.powermock:powermock-api-mockito2:2.0.0-beta.5"
 
     // Android testing
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"

app/src/main/AndroidManifest.xml

@@ -50,10 +50,13 @@
         </activity>
         <activity android:name=".WelcomeActivity" />
 
-        <activity android:name=".upload.UploadActivity"
+        <activity
+            android:name=".upload.UploadActivity"
+            android:configChanges="orientation|screenSize|keyboard"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:configChanges="orientation|screenSize|keyboard">
+            android:windowSoftInputMode="adjustResize"
+            >
             <intent-filter android:label="@string/intent_share_upload_label">
                 <action android:name="android.intent.action.SEND" />
 

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

@@ -3,11 +3,11 @@
 /**
  * Base presenter, enforcing contracts to atach and detach view
  */
-public interface BasePresenter {
+public interface BasePresenter<T> {
     /**
      * Until a view is attached, it is open to listen events from the presenter
      */
-    void onAttachView(MvpView view);
+    void onAttachView(T view);
 
     /**
      * Detaching a view makes sure that the view no more receives events from the presenter

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

@@ -11,6 +11,10 @@
 
 import org.wikipedia.dataclient.WikiSite;
 import org.wikipedia.page.PageTitle;
+import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.utils.ViewUtil;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
 
 import java.util.Locale;
 import java.util.regex.Pattern;

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java

@@ -28,7 +28,7 @@
  * success and error
  */
 @Singleton
-public class CampaignsPresenter implements BasePresenter {
+public class CampaignsPresenter implements BasePresenter<ICampaignsView> {
     private final OkHttpJsonApiClient okHttpJsonApiClient;
 
     private ICampaignsView view;
@@ -40,8 +40,9 @@ public CampaignsPresenter(OkHttpJsonApiClient okHttpJsonApiClient) {
         this.okHttpJsonApiClient = okHttpJsonApiClient;
     }
 
-    @Override public void onAttachView(MvpView view) {
-        this.view = (ICampaignsView) view;
+    @Override
+    public void onAttachView(ICampaignsView view) {
+        this.view=view;
     }
 
     @Override public void onDetachView() {

app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.java

@@ -19,7 +19,7 @@
 import io.reactivex.Observable;
 import timber.log.Timber;
 
-public class CategoriesModel implements CategoryClickedListener {
+public class CategoriesModel{
     private static final int SEARCH_CATS_LIMIT = 25;
 
     private final MediaWikiApi mwApi;
@@ -186,8 +186,7 @@ private Observable<CategoryItem> recentCategories() {
     //endregion
 
     //region Category Selection
-    @Override
-    public void categoryClicked(CategoryItem item) {
+    public void onCategoryItemClicked(CategoryItem item) {
         if (item.isSelected()) {
             selectCategory(item);
             updateCategoryCount(item);

app/src/main/java/fr/free/nrw/commons/category/CategoryItem.java

@@ -19,7 +19,7 @@ public CategoryItem[] newArray(int i) {
         }
     };
 
-    CategoryItem(String name, boolean selected) {
+    public CategoryItem(String name, boolean selected) {
         this.name = name;
         this.selected = selected;
     }

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

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.di;
 
-import javax.inject.Singleton;
-
 import dagger.Component;
 import dagger.android.AndroidInjectionModule;
 import dagger.android.AndroidInjector;
@@ -15,7 +13,12 @@
 import fr.free.nrw.commons.review.ReviewController;
 import fr.free.nrw.commons.settings.SettingsFragment;
 import fr.free.nrw.commons.upload.FileProcessor;
+import fr.free.nrw.commons.upload.UploadModule;
+import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
+import fr.free.nrw.commons.upload.license.MediaLicenseFragment;
+import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment;
 import fr.free.nrw.commons.widget.PicOfDayAppWidget;
+import javax.inject.Singleton;
 
 
 @Singleton
@@ -27,7 +30,7 @@
         ActivityBuilderModule.class,
         FragmentBuilderModule.class,
         ServiceBuilderModule.class,
-        ContentProviderBuilderModule.class
+        ContentProviderBuilderModule.class, UploadModule.class
 })
 public interface CommonsApplicationComponent extends AndroidInjector<ApplicationlessInjection> {
     void inject(CommonsApplication application);
@@ -51,6 +54,12 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
 
     void inject(PicOfDayAppWidget picOfDayAppWidget);
 
+    void inject(UploadCategoriesFragment uploadCategoriesFragment);
+
+    void inject(MediaLicenseFragment mediaLicenseFragment);
+
+    void inject(UploadMediaDetailFragment uploadMediaDetailFragment);
+
     void inject(ContributionViewHolder viewHolder);
 
     @Component.Builder

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

@@ -8,6 +8,9 @@
 
 import com.google.gson.Gson;
 
+import io.reactivex.Scheduler;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36,6 +39,8 @@
 @SuppressWarnings({"WeakerAccess", "unused"})
 public class CommonsApplicationModule {
     private Context applicationContext;
+    public static final String IO_THREAD="io_thread";
+    public static final String MAIN_THREAD="main_thread";
 
     public CommonsApplicationModule(Context applicationContext) {
         this.applicationContext = applicationContext;
@@ -171,4 +176,16 @@ public WikidataEditListener provideWikidataEditListener() {
     public boolean provideIsBetaVariant() {
         return ConfigUtils.isBetaFlavour();
     }
+
+    @Named(IO_THREAD)
+    @Provides
+    public Scheduler providesIoThread(){
+        return Schedulers.io();
+    }
+
+    @Named(MAIN_THREAD)
+    @Provides
+    public Scheduler providesMainThread(){
+        return AndroidSchedulers.mainThread();
+    }
 }

app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java

@@ -40,6 +40,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import io.reactivex.disposables.Disposable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Represents search screen of this app

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -59,6 +59,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.util.DateUtil;
 import org.wikipedia.util.StringUtil;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Locale;
+import javax.inject.Inject;
+import javax.inject.Provider;
 import timber.log.Timber;
 
 import static android.view.View.GONE;

app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

@@ -44,11 +44,15 @@
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
+import javax.inject.Inject;
+import javax.inject.Named;
 import timber.log.Timber;
 
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
 import static android.content.Context.DOWNLOAD_SERVICE;
 import static fr.free.nrw.commons.Utils.handleWebUrl;
+import static android.content.Intent.ACTION_VIEW;
+import static android.widget.Toast.LENGTH_SHORT;
 
 public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener {
 

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

@@ -0,0 +1,72 @@
+package fr.free.nrw.commons.repository;
+
+import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.upload.UploadModel;
+import fr.free.nrw.commons.upload.UploadModel.UploadItem;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+@Singleton
+public class UploadLocalDataSource {
+
+    private final UploadModel uploadModel;
+    private JsonKvStore defaultKVStore;
+
+    @Inject
+    public UploadLocalDataSource(
+            @Named("default_preferences") JsonKvStore defaultKVStore,
+            UploadModel uploadModel) {
+        this.defaultKVStore = defaultKVStore;
+        this.uploadModel = uploadModel;
+    }
+
+
+    public List<String> getLicenses() {
+        return uploadModel.getLicenses();
+    }
+
+    public String getFromDefaultKvStore(String key, String defaultValue) {
+        return defaultKVStore.getString(key, defaultValue);
+    }
+
+    public void saveInDefaultKvStore(String key, String value) {
+        defaultKVStore.putString(key, value);
+    }
+
+    public int getCount() {
+        return uploadModel.getCount();
+    }
+
+    public String getSelectedLicense() {
+        return uploadModel.getSelectedLicense();
+    }
+
+    public void setSelectedLicense(String licenseName) {
+        uploadModel.setSelectedLicense(licenseName);
+    }
+
+    public void updateUploadItem(int index, UploadItem uploadItem) {
+        uploadModel.updateUploadItem(index, uploadItem);
+    }
+
+    public void saveInDirectKvStore(String key, boolean value) {
+        defaultKVStore.putBoolean(key, value);
+    }
+
+    public void cleanUp() {
+        uploadModel.cleanUp();
+    }
+
+    public void deletePicture(String filePath) {
+        uploadModel.deletePicture(filePath);
+    }
+
+    public UploadItem getPreviousUploadItem(int index) {
+        if(index-1>=0){
+            return uploadModel.getItems().get(index-1);
+        }
+        return null; //There is no previous item to copy details
+    }
+}

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

@@ -0,0 +1,98 @@
+package fr.free.nrw.commons.repository;
+
+import fr.free.nrw.commons.category.CategoriesModel;
+import fr.free.nrw.commons.category.CategoryItem;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.filepicker.UploadableFile;
+import fr.free.nrw.commons.nearby.Place;
+import fr.free.nrw.commons.upload.SimilarImageInterface;
+import fr.free.nrw.commons.upload.UploadController;
+import fr.free.nrw.commons.upload.UploadModel;
+import fr.free.nrw.commons.upload.UploadModel.UploadItem;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import java.util.Comparator;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class UploadRemoteDataSource {
+
+    private UploadModel uploadModel;
+    private UploadController uploadController;
+    private CategoriesModel categoriesModel;
+
+    @Inject
+    public UploadRemoteDataSource(UploadModel uploadModel, UploadController uploadController,
+            CategoriesModel categoriesModel) {
+        this.uploadModel = uploadModel;
+        this.uploadController = uploadController;
+        this.categoriesModel = categoriesModel;
+    }
+
+    public Observable<Contribution> buildContributions() {
+        return uploadModel.buildContributions();
+    }
+
+    public void startUpload(Contribution contribution) {
+        uploadController.startUpload(contribution);
+    }
+
+    public List<UploadItem> getUploads() {
+        return uploadModel.getUploads();
+    }
+
+    public void prepareService() {
+        uploadController.prepareService();
+    }
+
+    public void cleanup() {
+        uploadController.cleanup();
+    }
+
+    public List<CategoryItem> getSelectedCategories() {
+        return categoriesModel.getSelectedCategories();
+    }
+
+    public Observable<CategoryItem> searchAll(String query, List<String> imageTitleList) {
+        return categoriesModel.searchAll(query, imageTitleList);
+    }
+
+    public Observable<CategoryItem> searchCategories(String query, List<String> imageTitleList) {
+        return categoriesModel.searchCategories(query, imageTitleList);
+    }
+
+    public Observable<CategoryItem> defaultCategories(List<String> imageTitleList) {
+        return categoriesModel.defaultCategories(imageTitleList);
+    }
+
+    public List<String> getCategoryStringList() {
+        return categoriesModel.getCategoryStringList();
+    }
+
+    public void setSelectedCategories(List<String> categoryStringList) {
+        uploadModel.setSelectedCategories(categoryStringList);
+    }
+
+    public void onCategoryClicked(CategoryItem categoryItem) {
+        categoriesModel.onCategoryItemClicked(categoryItem);
+    }
+
+    public Comparator<CategoryItem> sortBySimilarity(String query) {
+        return categoriesModel.sortBySimilarity(query);
+    }
+
+    public boolean containsYear(String name) {
+        return categoriesModel.containsYear(name);
+    }
+
+    public Observable<UploadItem> preProcessImage(UploadableFile uploadableFile, Place place,
+            String source, SimilarImageInterface similarImageInterface) {
+        return uploadModel.preProcessImage(uploadableFile,place,source,similarImageInterface);
+    }
+
+    public Single<Integer> getImageQuality(UploadItem uploadItem, boolean shouldValidateTitle) {
+        return uploadModel.getImageQuality(uploadItem,shouldValidateTitle);
+    }
+}