Merge branch 'master' into zoom-image

Author: ShridharGoel

.travis.yml

@@ -15,11 +15,11 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-27.0.3
+  - build-tools-28.0.3
   - extra-google-m2repository
   - extra-android-m2repository
   - android-22
-  - android-27
+  - android-28
   - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
   licenses:
   - android-sdk-license-.+

app/build.gradle

@@ -39,9 +39,6 @@ dependencies {
     implementation files('libs/simplemagic-1.9.jar')
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
-    implementation('com.github.esafirm.android-image-picker:imagepicker:1.13.1', {
-        exclude group: 'com.github.bumptech.glide', module: 'glide'
-    })
 
     // Logging
     implementation 'ch.acra:acra:4.9.2'

app/src/main/AndroidManifest.xml

@@ -69,7 +69,8 @@
         <activity
             android:name=".contributions.MainActivity"
             android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name" />
+            android:label="@string/app_name"
+            android:configChanges="orientation|screenSize|keyboard" />
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/title_activity_settings" />
@@ -158,7 +159,7 @@
             android:process=":acra" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name=".filepicker.ExtendedFileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

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

@@ -1,5 +1,7 @@
 package fr.free.nrw.commons;
 
+import android.content.Context;
+
 /**
  * Base presenter, enforcing contracts to atach and detach view
  */

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

@@ -14,6 +14,10 @@
 import java.util.regex.Pattern;
 
 import fr.free.nrw.commons.location.LatLng;
+import fr.free.nrw.commons.media.model.ImageInfo;
+import fr.free.nrw.commons.media.model.MwQueryPage;
+import fr.free.nrw.commons.utils.DateUtils;
+import fr.free.nrw.commons.utils.StringUtils;
 
 public class Media implements Parcelable {
 
@@ -428,4 +432,24 @@ public void setRequestedDeletion(){
     public boolean getRequestedDeletion(){
         return requestedDeletion;
     }
+
+    public static Media from(MwQueryPage page) {
+        ImageInfo imageInfo = page.imageInfo();
+        if(imageInfo == null) {
+            return null;
+        }
+        Media media = new Media(null,
+                imageInfo.getOriginalUrl(),
+                page.title(),
+                imageInfo.getMetadata().imageDescription().value(),
+                0,
+                DateUtils.getDateFromString(imageInfo.getMetadata().getDateTimeOriginal().value()),
+                DateUtils.getDateFromString(imageInfo.getMetadata().getDateTime().value()),
+                StringUtils.getParsedStringFromHtml(imageInfo.getMetadata().getArtist().value())
+        );
+
+        media.setLicense(imageInfo.getMetadata().getLicenseShortName().value());
+
+        return media;
+    }
 }

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

@@ -1,6 +1,8 @@
 package fr.free.nrw.commons;
 
 import android.content.ActivityNotFoundException;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -237,5 +239,14 @@ public static <K,V> Map<K,V>  arraysToMap(K[] kArray, V[] vArray){
         }
         return map;
     }
+    /*
+    *Copies the content to the clipboard
+    *
+    */
+    public static void copy(String label,String text, Context context){
+        ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clip = ClipData.newPlainText(label, text);
+        clipboard.setPrimaryClip(clip);
+    }
 
 }

app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java

@@ -43,6 +43,7 @@
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.Single;
@@ -100,7 +101,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
     @Inject
     SessionManager sessionManager;
     @Inject
-    MediaWikiApi mediaWikiApi;
+    OkHttpJsonApiClient okHttpJsonApiClient;
     MenuItem item;
 
     private CompositeDisposable compositeDisposable = new CompositeDisposable();
@@ -201,7 +202,7 @@ private void setAchievements() {
         if (checkAccount()) {
             try{
 
-                compositeDisposable.add(mediaWikiApi
+                compositeDisposable.add(okHttpJsonApiClient
                         .getAchievements(Objects.requireNonNull(sessionManager.getCurrentAccount()).name)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -247,7 +248,7 @@ private void onError() {
      */
     private void setUploadCount(Achievements achievements) {
         if (checkAccount()) {
-            compositeDisposable.add(mediaWikiApi
+            compositeDisposable.add(okHttpJsonApiClient
                     .getUploadCount(Objects.requireNonNull(sessionManager.getCurrentAccount()).name)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java

@@ -10,11 +10,14 @@
 import android.view.View;
 import android.widget.AdapterView;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.AuthenticatedActivity;
+import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 
@@ -31,6 +34,9 @@ public class BookmarksActivity extends NavigationBaseActivity
     @BindView(R.id.tabLayoutBookmarks)
     TabLayout tabLayout;
 
+    @Inject
+    ContributionController controller;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,6 +73,12 @@ public void onBackStackChanged() {
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        controller.handleActivityResult(this, requestCode, resultCode, data);
+    }
+
     /**
      * This method is called onClick of media inside category details (CategoryImageListFragment).
      */

app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java

@@ -13,8 +13,6 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.esafirm.imagepicker.features.ImagePicker;
-import com.esafirm.imagepicker.model.Image;
 import com.pedrogomez.renderers.RVRendererAdapter;
 
 import java.util.ArrayList;
@@ -32,8 +30,6 @@
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.nearby.NearbyAdapterFactory;
 import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.utils.ImageUtils;
-import fr.free.nrw.commons.utils.IntentUtils;
 
 public class BookmarkLocationsFragment extends DaggerFragment {
 
@@ -99,12 +95,6 @@ private void initList() {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (IntentUtils.shouldBookmarksHandle(requestCode, resultCode, data)) {
-            List<Image> images = ImagePicker.getImages(data);
-            Intent shareIntent = contributionController.handleImagesPicked(ImageUtils.getUriListFromImages(images), requestCode);
-            startActivity(shareIntent);
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
+        contributionController.handleActivityResult(getActivity(), requestCode, resultCode, data);
     }
 }

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesController.java

@@ -8,20 +8,21 @@
 
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.bookmarks.Bookmark;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 
 @Singleton
 public class BookmarkPicturesController {
 
-    private MediaWikiApi mediaWikiApi;
-
-    @Inject
-    BookmarkPicturesDao bookmarkDao;
+    private final OkHttpJsonApiClient okHttpJsonApiClient;
+    private final BookmarkPicturesDao bookmarkDao;
 
     private List<Bookmark> currentBookmarks;
 
-    @Inject public BookmarkPicturesController(MediaWikiApi mediaWikiApi) {
-        this.mediaWikiApi = mediaWikiApi;
+    @Inject
+    public BookmarkPicturesController(OkHttpJsonApiClient okHttpJsonApiClient,
+                                      BookmarkPicturesDao bookmarkDao) {
+        this.okHttpJsonApiClient = okHttpJsonApiClient;
+        this.bookmarkDao = bookmarkDao;
         currentBookmarks = new ArrayList<>();
     }
 
@@ -34,7 +35,9 @@ List<Media> loadBookmarkedPictures() {
         currentBookmarks = bookmarks;
         ArrayList<Media> medias = new ArrayList<>();
         for (Bookmark bookmark : bookmarks) {
-            List<Media> tmpMedias = mediaWikiApi.searchImages(bookmark.getMediaName(), 0);
+            List<Media> tmpMedias = okHttpJsonApiClient
+                    .searchImages(bookmark.getMediaName(), 0)
+                    .blockingGet();
             for (Media m : tmpMedias) {
                 if (m.getCreator().trim().equals(bookmark.getMediaCreator().trim())) {
                     medias.add(m);

app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java

@@ -13,11 +13,13 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
+import javax.inject.Singleton;
 
 import fr.free.nrw.commons.bookmarks.Bookmark;
 
 import static fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider.BASE_URI;
 
+@Singleton
 public class BookmarkPicturesDao {
 
     private final Provider<ContentProviderClient> clientProvider;

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

@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.campaigns;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.util.Log;
 
 import java.text.ParseException;
@@ -8,9 +10,13 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import fr.free.nrw.commons.BasePresenter;
 import fr.free.nrw.commons.MvpView;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
 import io.reactivex.Single;
 import io.reactivex.SingleObserver;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -21,16 +27,22 @@
  * The presenter for the campaigns view, fetches the campaigns from the api and informs the view on
  * success and error
  */
+@Singleton
 public class CampaignsPresenter implements BasePresenter {
+    private final OkHttpJsonApiClient okHttpJsonApiClient;
+
     private final String TAG = "#CampaignsPresenter#";
     private ICampaignsView view;
-    private MediaWikiApi mediaWikiApi;
     private Disposable disposable;
     private Campaign campaign;
 
+    @Inject
+    public CampaignsPresenter(OkHttpJsonApiClient okHttpJsonApiClient) {
+        this.okHttpJsonApiClient = okHttpJsonApiClient;
+    }
+
     @Override public void onAttachView(MvpView view) {
         this.view = (ICampaignsView) view;
-        this.mediaWikiApi = ((ICampaignsView) view).getMediaWikiApi();
     }
 
     @Override public void onDetachView() {
@@ -43,14 +55,15 @@ public class CampaignsPresenter implements BasePresenter {
     /**
      * make the api call to fetch the campaigns
      */
+    @SuppressLint("CheckResult")
     public void getCampaigns() {
-        if (view != null && mediaWikiApi != null) {
+        if (view != null && okHttpJsonApiClient != null) {
             //If we already have a campaign, lets not make another call
             if (this.campaign != null) {
                 view.showCampaigns(campaign);
                 return;
             }
-            Single<CampaignResponseDTO> campaigns = mediaWikiApi.getCampaigns();
+            Single<CampaignResponseDTO> campaigns = okHttpJsonApiClient.getCampaigns();
             campaigns.observeOn(AndroidSchedulers.mainThread())
                 .subscribeOn(Schedulers.io())
                 .subscribeWith(new SingleObserver<CampaignResponseDTO>() {

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

@@ -7,7 +7,5 @@
  * Interface which defines the view contracts of the campaign view
  */
 public interface ICampaignsView extends MvpView {
-    MediaWikiApi getMediaWikiApi();
-
     void showCampaigns(Campaign campaign);
 }