Sync master with release (commons-app#3922)

* commons-app#3624 DateTimeFormat wrong - match pattern returned from servers (commons-app#3625)

* Revert "Fixes: commons-app#3179 Make category search non case-sensitive (commons-app#3326)" (commons-app#3636)

Simply lower casing the name of the category sent to the server
doesn't result in the server doing a case insensitive category
search. In fact, it reduces the category search space as only
categories that has a lower case character is searched even
if the search text contains upper case characters.

The test case did not catch this issue as the first character
of the title is case insensitive[1].

So, revert the changes done in commit afdeaae.

See further disucssion in the issue thread of commons-app#3179 starting
from [2].

[1]: https://www.mediawiki.org/wiki/Manual:Page_title
[2]: commons-app#3179 (comment)

* Bugfix/security exception (commons-app#3627)

* Fixes commons-app#3626
* Check is file is actually created before writing to file, file picker android

* Handle Security exception

* Fixes commons-app#3436 and commons-app#2881: Media Detail design Overhaul (commons-app#3505)

* ic_map_dark_24dp: map icon for white background

* ic_info_outline_dark_24dp: info icon for dark background

* MediaDetailFragment: update the spacer as per image aspect ratio

* fragment_media_detail: design overhaul

* fragment_media_detail: remove redundant background color statements

* make requested changes

* add dark mode support

* minor ui tweak

* white map icon in dark mode

* make rquested changes

* make requested changes to layout

* fix misalignment of category list

* subtle amendments

* convert comments to javadocs

* minor amendments

* minor changes

* add styles for media detail

* Media detail fragment refactored

* make suggested changes

* minor name fix

* fix the delete button border

* Fixes commons-app#3639 (Fix Save State implementation of CheckBoxTriState ) (commons-app#3686)

* Add commons-app#3723 and commons-app#3721 to 2.13 release, fix conflicts

Conflicts were caused by merging commons-app#3723 before commons-app#3721 , so I just rolled both into one commit.

* Fix NullPointer when clicking on image in MediaDetailFragment (commons-app#3730)… (commons-app#3739)

* Update changelog.md

* Versioning for v2.13

* Fixes commons-app#3705 (Crash when viewing pic I just uploaded) (commons-app#3782)

* Fixes commons-app#3705
* Let the MediaDetailPager fragment know when the contributions have been updated

* Handle NPE, null check on adapter in MediaDetailPagerFragment

* Fixed BookmarkLocationsDao DB migration (commons-app#3793)

* Fixes commons-app#3725 (commons-app#3795)

* Downgraded okhttp version to support Api 19 devices

* Handled null CompoundDrawable[2] in etTitle-> UploadMediaDetailsFragment (commons-app#3828)

* DownSample Upload image to be shown in UploadMediaDetailFragment to handle OOM, Bitmap Too large exception (commons-app#3830)

* Fixes commons-app#3829
* DownSample Upload image to be shown in UploadMediaDetailFragment to handle OOM, Bitmap Too large exception

* removed unused imports, handled possible exceptions

* Let Fresco handle the downsampling of image

* invalidate in onTransformEnd

* Expose an interface TransformationListener in ZoomableDraweeView to listen to transformation change end

* removed photoView dependency

* removed unused imports in ZoomableActivity

* Bugfix, expand/collapse

* changed functio name

* Bugfix/p18 uploads (commons-app#3869)

* updated gradle plugin version

* BugFix commons-app#3856
* Do not use preference for deciding acceptable lat long for nearby uploads, instead save the corresponding location in the Contribution via UploadItem

* Marshall contribution's hasInvalidLocation

* reset un-related changes

* Fixed test cases

* Minor code formatting and docs

* Fixes commons-app#3882 (commons-app#3883)

* Make hasInvalidLocation non-null integer with default value 0

Co-authored-by: Ashish Kumar <[email protected]>

* Fixes commons-app#3766, Added OPENSTREET attribution (commons-app#3889)

* Fixes commons-app#3766
* Added OPENSTREET attribution in nearby

* Added custom text attribution in Nearby

* Deleted unused class CustomBorderTextView

* review suggested changes

* modified telemetry summary string

* Versioning and changelog for v2.13.1 (commons-app#3908)

* Update changelog.md

* Versioning for v2.13.1

* Fixes commons-app#3914 (commons-app#3915)

* Verify user login before setting upload count

* fixed compile-time error

* fix erros

* delete emptied files

* remove empty file CategoriesModel.java

Co-authored-by: Seán Mac Gillicuddy <[email protected]>
Co-authored-by: Kaartic Sivaraam <[email protected]>
Co-authored-by: Kshitij Bhardwaj <[email protected]>
Co-authored-by: Vitaly V. Pinchuk <[email protected]>
Co-authored-by: Josephine Lim <[email protected]>
Co-authored-by: Ashish Kumar <[email protected]>

Author: 7 people

app/build.gradle

@@ -21,7 +21,9 @@ dependencies {
     // Utils
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
+    implementation ("com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"){
+        force = true //API 19 support
+    }
     implementation 'com.squareup.okio:okio:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
@@ -35,6 +37,7 @@ dependencies {
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.pedrovgs:renderers:3.3.3'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.6.2'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.11.0'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.4.0'
@@ -51,7 +54,7 @@ dependencies {
     testImplementation "androidx.paging:paging-common-ktx:$PAGING_VERSION"
     implementation "androidx.paging:paging-rxjava2-ktx:$PAGING_VERSION"
     implementation "androidx.recyclerview:recyclerview:1.2.0-alpha02"
-    implementation 'com.squareup.okhttp3:okhttp-ws:3.4.1'
+    implementation "com.squareup.okhttp3:okhttp-ws:$OKHTTP_VERSION"
 
     // Logging
     implementation 'ch.acra:acra-dialog:5.3.0'
@@ -60,7 +63,7 @@ dependencies {
     api('com.github.tony19:logback-android-classic:1.1.1-6') {
         exclude group: 'com.google.android', module: 'android'
     }
-    implementation "com.squareup.okhttp3:logging-interceptor:4.5.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:$OKHTTP_VERSION"
 
     // Dependency injector
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
@@ -81,7 +84,7 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'androidx.test:core:1.2.0'
-    testImplementation "com.squareup.okhttp3:mockwebserver:4.8.0"
+    testImplementation "com.squareup.okhttp3:mockwebserver:$OKHTTP_VERSION"
     testImplementation "org.powermock:powermock-module-junit4:2.0.0-beta.5"
     testImplementation "org.powermock:powermock-api-mockito2:2.0.0-beta.5"
     testImplementation 'org.mockito:mockito-core:2.23.0'
@@ -139,8 +142,8 @@ android {
 
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
-        versionCode 561
-        versionName '2.12.3'
+        versionCode 775
+        versionName '2.13.1'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19

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

@@ -248,24 +248,44 @@ public static void onDelete(SQLiteDatabase db) {
 
         public static void onUpdate(SQLiteDatabase db, int from, int to) {
             Timber.d("bookmarksLocations db is updated from:"+from+", to:"+to);
-            switch (from) {
-                case 7: onCreate(db);
-                case 8: // No change
-                case 9: // No change
-                case 10:
-                    try {
-                        db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
-                    } catch (SQLiteException exception){
-                        Timber.e(exception);
-                    }
-                case 11: // No change
-                case 12:
-                    try {
-                        db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_destroyed STRING;");
-                    }catch (SQLiteException exception){
-                        Timber.e(exception);
-                    }
-                    break;
+            if (from == to) {
+                return;
+            }
+            if (from < 7) {
+                // doesn't exist yet
+                from++;
+                onUpdate(db, from, to);
+                return;
+            }
+            if (from == 7) {
+                // table added in version 8
+                onCreate(db);
+                from++;
+                onUpdate(db, from, to);
+                return;
+            }
+            if (from == 8) {
+                from++;
+                onUpdate(db, from, to);
+                return;
+            }
+            if (from == 10) {
+                //This is safe, and can be called clean, as we/I do not remember the appropriate version for this
+                //We are anyways switching to room, these things won't be necessary then
+                try {
+                    db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
+                }catch (SQLiteException exception){
+                    Timber.e(exception);//
+                }
+                return;
+            }
+            if (from == 12) {
+                try {
+                    db.execSQL(
+                        "ALTER TABLE bookmarksLocations ADD COLUMN location_destroyed STRING;");
+                } catch (SQLiteException exception) {
+                    Timber.e(exception);
+                }
             }
         }
     }

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -38,7 +38,8 @@ data class Contribution constructor(
     val localUri: Uri? = null,
     var dataLength: Long = 0,
     var dateCreated: Date? = null,
-    var dateModified: Date? = null
+    var dateModified: Date? = null,
+    var hasInvalidLocation : Int =  0
 ) : Parcelable {
 
     fun completeWith(media: Media): Contribution {
@@ -65,6 +66,18 @@ data class Contribution constructor(
         wikidataPlace = from(item.place)
     )
 
+    /**
+     * Set this true when ImageProcessor has said that the location is invalid
+     * @param hasInvalidLocation
+     */
+    fun setHasInvalidLocation(hasInvalidLocation: Boolean) {
+        this.hasInvalidLocation = if (hasInvalidLocation) 1 else 0
+    }
+
+    fun hasInvalidLocation(): Boolean {
+        return hasInvalidLocation == 1
+    }
+
     companion object {
         const val STATE_COMPLETED = -1
         const val STATE_FAILED = 1

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -22,6 +22,15 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
 import androidx.fragment.app.FragmentTransaction;
+
+import fr.free.nrw.commons.MediaDataExtractor;
+import fr.free.nrw.commons.auth.SessionManager;
+import io.reactivex.disposables.Disposable;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.Media;
@@ -83,6 +92,9 @@ public class ContributionsFragment
 
     @Inject ContributionsPresenter contributionsPresenter;
 
+    @Inject
+    SessionManager sessionManager;
+
     private LatLng curLatLng;
 
     private boolean firstLocationUpdate = true;
@@ -143,7 +155,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         initFragments();
 
-        if (!ConfigUtils.isBetaFlavour()) {
+        if(shouldShowMediaDetailsFragment){
+            showMediaDetailPagerFragment();
+        }else{
+            showContributionsListFragment();
+        }
+
+        if (!ConfigUtils.isBetaFlavour() && sessionManager.isUserLoggedIn()
+            && sessionManager.getCurrentAccount() != null) {
             setUploadCount();
         }
 

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -132,7 +132,7 @@ private void initRecyclerView() {
         getSpanCount(getResources().getConfiguration().orientation));
     rvContributionsList.setLayoutManager(layoutManager);
     contributionsListPresenter.setup();
-    contributionsListPresenter.contributionList.observe(this, adapter::submitList);
+    contributionsListPresenter.contributionList.observe(this.getViewLifecycleOwner(), adapter::submitList);
     rvContributionsList.setAdapter(adapter);
   }
 

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

@@ -7,6 +7,8 @@
 import android.view.inputmethod.InputMethodManager;
 import androidx.collection.LruCache;
 import androidx.room.Room;
+import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
 import com.google.gson.Gson;
 import dagger.Module;
 import dagger.Provides;
@@ -49,6 +51,15 @@ public class CommonsApplicationModule {
     private Context applicationContext;
     public static final String IO_THREAD="io_thread";
     public static final String MAIN_THREAD="main_thread";
+    private AppDatabase appDatabase;
+
+    static final Migration MIGRATION_1_2 = new Migration(1, 2) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE contribution "
+                + " ADD COLUMN hasInvalidLocation INTEGER NOT NULL DEFAULT 0");
+        }
+    };
 
     public CommonsApplicationModule(Context applicationContext) {
         this.applicationContext = applicationContext;
@@ -103,11 +114,6 @@ public ContentProviderClient provideCategoryContentProviderClient(Context contex
         return context.getContentResolver().acquireContentProviderClient(BuildConfig.CATEGORY_AUTHORITY);
     }
 
-    /**
-     * This method is used to provide instance of DepictsContentProviderClient
-     * @param context context
-     * @return DepictsContentProviderClient*/
-
     /**
      * This method is used to provide instance of RecentSearchContentProviderClient
      * which provides content of Recent Searches from database
@@ -224,9 +230,11 @@ public String provideLoggedInUsername() {
     @Provides
     @Singleton
     public AppDatabase provideAppDataBase() {
-        return Room.databaseBuilder(applicationContext, AppDatabase.class, "commons_room.db")
+        appDatabase = Room.databaseBuilder(applicationContext, AppDatabase.class, "commons_room.db")
+            .addMigrations(MIGRATION_1_2)
             .fallbackToDestructiveMigration()
             .build();
+        return appDatabase;
     }
 
     @Provides

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

@@ -76,7 +76,7 @@ public HttpLoggingInterceptor provideHttpLoggingInterceptor() {
         HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(message -> {
             Timber.tag("OkHttp").v(message);
         });
-        httpLoggingInterceptor.level(BuildConfig.DEBUG ? Level.BODY: Level.BASIC);
+        httpLoggingInterceptor.setLevel(BuildConfig.DEBUG ? Level.BODY: Level.BASIC);
         return httpLoggingInterceptor;
     }
 

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

@@ -295,7 +295,9 @@ public void showImage(int i) {
      * The method notify the viewpager that number of items have changed.
      */
     public void notifyDataSetChanged(){
-        adapter.notifyDataSetChanged();
+        if (null != adapter) {
+            adapter.notifyDataSetChanged();
+        }
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

@@ -19,6 +19,8 @@
 import android.graphics.drawable.VectorDrawable;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -39,6 +41,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -75,7 +78,6 @@
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.contributions.MainActivity;
-import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LocationServiceManager;
@@ -154,6 +156,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     @BindView(R.id.rv_nearby_list)
     RecyclerView rvNearbyList;
     @BindView(R.id.no_results_message) TextView noResultsView;
+    @BindView(R.id.tv_attribution)
+    AppCompatTextView tvAttribution;
 
     @Inject LocationServiceManager locationManager;
     @Inject NearbyController nearbyController;
@@ -235,8 +239,8 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
                 final UiSettings uiSettings = mapBoxMap.getUiSettings();
                 uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
                 uiSettings.setCompassMargins(12, 0, 0, 24);
-                uiSettings.setLogoEnabled(true);
-                uiSettings.setAttributionEnabled(true);
+                uiSettings.setLogoEnabled(false);
+                uiSettings.setAttributionEnabled(false);
                 uiSettings.setRotateGesturesEnabled(false);
                 isMapBoxReady =true;
                 performMapReadyActions();
@@ -259,6 +263,9 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
                 scaleBarPlugin.create(scaleBarOptions);
             });
         });
+
+        tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
+        tvAttribution.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
     /**
@@ -659,7 +666,7 @@ public LatLng getLastFocusLocation() {
 
     @Override
     public boolean isCurrentLocationMarkerVisible() {
-        if (latLngBounds == null) {
+        if (latLngBounds == null || currentLocationMarker==null) {
             Timber.d("Map projection bounds are null");
             return false;
         } else {

app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java

@@ -14,6 +14,8 @@
 import com.karumi.dexter.Dexter;
 import com.karumi.dexter.listener.PermissionGrantedResponse;
 import com.karumi.dexter.listener.single.BasePermissionListener;
+import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.maps.TelemetryDefinition;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
@@ -85,6 +87,24 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             findPreference("displayLocationPermissionForCardView").setEnabled(false);
             findPreference("displayCampaignsCardView").setEnabled(false);
         }
+
+        findPreference("telemetryOptOut").setOnPreferenceChangeListener(
+            (preference, newValue) -> {
+                telemetryOptInOut((boolean)newValue);
+                defaultKvStore.putBoolean(Prefs.TELEMETRY_PREFERENCE,(boolean)newValue);
+                return false;
+            });
+    }
+
+    /**
+     * Opt in or out of MapBox telemetry
+     * @param shouldOptIn
+     */
+    private void telemetryOptInOut(boolean shouldOptIn){
+        TelemetryDefinition telemetry = Mapbox.getTelemetry();
+        if (telemetry != null) {
+            telemetry.setUserTelemetryRequestState(shouldOptIn);
+        }
     }
 
     /**

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

@@ -22,6 +22,8 @@ public class UploadItem {
   private final long createdTimestamp;
   private final String createdTimestampSource;
   private final BehaviorSubject<Integer> imageQuality;
+  private boolean hasInvalidLocation;
+
 
   @SuppressLint("CheckResult")
   UploadItem(final Uri mediaUri,
@@ -103,4 +105,11 @@ public void setGpsCoords(final ImageCoordinates gpsCoords) {
     this.gpsCoords = gpsCoords;
   }
 
+  public void setHasInvalidLocation(boolean hasInvalidLocation) {
+    this.hasInvalidLocation=hasInvalidLocation;
+  }
+
+  public boolean hasInvalidLocation() {
+    return hasInvalidLocation;
+  }
 }