Merge 4.0-release into master

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Wikimedia Commons for Android
 
+## v4.0.3
+- Added "Report" button for Google UGC policy
+
+## v4.0.2
+- Fixed bug with wrong dates taken from EXIF
+- Fixed various crashes
+
+## v4.0.1
+- Fixed bug with no browser found
+- Updated Mapbox SDK to fix hamburger crash
+
+## v4.0.0
+- Added map showing nearby Commons pictures
+- Added custom SPARQL queries
+- Added user profiles
+- Added custom picture selector
+- Various bugfixes
+- Updated target SDK to 30
+
 ## v3.1.1
 - Optimized Nearby query
 - Added Sweden's property for WLM 2021

app/build.gradle

@@ -38,10 +38,10 @@ dependencies {
     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:9.1.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.11.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.4.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.5.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:7.0.0'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
@@ -173,8 +173,8 @@ android {
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
 
-        versionCode 1025
-        versionName '3.1.1'
+        versionCode 1029
+        versionName '4.0.3'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19

app/src/main/AndroidManifest.xml

@@ -18,6 +18,16 @@
     <uses-permission android:name="android.permission.SET_WALLPAPER"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <queries>
+        <!-- Browser -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+        <!-- Google Maps -->
+        <package android:name="com.google.android.apps.maps" />
+    </queries>
 
 
     <!-- Needed only if your app targets Android 5.0 (API level 21) or higher. -->

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

@@ -110,6 +110,10 @@ public class CommonsApplication extends MultiDexApplication {
 
     public static final String FEEDBACK_EMAIL_SUBJECT = "Commons Android App Feedback";
 
+    public static final String REPORT_EMAIL = "commons-app-android-private@googlegroups.com";
+
+    public static final String REPORT_EMAIL_SUBJECT = "Report a violation";
+
     public static final String NOTIFICATION_CHANNEL_ID_ALL = "CommonsNotificationAll";
 
     public static final String FEEDBACK_EMAIL_TEMPLATE_HEADER = "-- Technical information --";

app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java

@@ -155,7 +155,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) {
         addCredits();
         getToolbarUI();
 
-        if (activity.equals("UploadActivity")) {
+        if ("UploadActivity".equals(activity)) {
             placeSelectedButton.setVisibility(View.GONE);
             modifyLocationButton.setVisibility(View.VISIBLE);
             showInMapButton.setVisibility(View.VISIBLE);

app/src/main/java/fr/free/nrw/commons/bookmarks/items/BookmarkItemsDao.java

@@ -309,22 +309,18 @@ public static void onUpdate(final SQLiteDatabase db, int from, final int to) {
             if (from == to) {
                 return;
             }
-            if (from < 7) {
+            if (from < 18) {
+                // doesn't exist yet
                 from++;
                 onUpdate(db, from, to);
                 return;
             }
 
-            if (from == 7) {
+            if (from == 18) {
+                // table added in version 19
                 onCreate(db);
                 from++;
                 onUpdate(db, from, to);
-                return;
-            }
-
-            if (from == 8) {
-                from++;
-                onUpdate(db, from, to);
             }
         }
     }

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

@@ -93,9 +93,11 @@ List<CategoryItem> recentCategories(int limit) {
             // fixme add a limit on the original query instead of falling out of the loop?
             while (cursor != null && cursor.moveToNext()
                     && cursor.getPosition() < limit) {
-                items.add(new CategoryItem(fromCursor(cursor).getName(),
-                    fromCursor(cursor).getDescription(), fromCursor(cursor).getThumbnail(),
-                    false));
+                if (fromCursor(cursor).getName() != null ) {
+                    items.add(new CategoryItem(fromCursor(cursor).getName(),
+                        fromCursor(cursor).getDescription(), fromCursor(cursor).getThumbnail(),
+                        false));
+                }
             }
         } catch (RemoteException e) {
             throw new RuntimeException(e);
@@ -193,6 +195,13 @@ public static void onUpdate(SQLiteDatabase db, int from, int to) {
                 onUpdate(db, from, to);
                 return;
             }
+            if (from == 17) {
+                db.execSQL("ALTER TABLE categories ADD COLUMN description STRING;");
+                db.execSQL("ALTER TABLE categories ADD COLUMN thumbnail STRING;");
+                from++;
+                onUpdate(db, from, to);
+                return;
+            }
         }
     }
 }

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

@@ -4,8 +4,8 @@ import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
-data class CategoryItem(val name: String, val description: String,
-                        val thumbnail: String, var isSelected: Boolean) : Parcelable {
+data class CategoryItem(val name: String, val description: String?,
+                        val thumbnail: String?, var isSelected: Boolean) : Parcelable {
 
     override fun toString(): String {
         return "CategoryItem: '$name'"

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

@@ -38,6 +38,7 @@ data class Contribution constructor(
     val localUri: Uri? = null,
     var dataLength: Long = 0,
     var dateCreated: Date? = null,
+    var dateCreatedString: String? = null,
     var dateModified: Date? = null,
     var hasInvalidLocation : Int =  0,
     var contentUri: Uri? = null,
@@ -70,6 +71,7 @@ data class Contribution constructor(
         depictedItems = depictedItems,
         wikidataPlace = from(item.place),
         contentUri = item.contentUri,
+        dateCreatedString = item.fileCreatedDateString,
         imageSHA1 = imageSHA1
     )
 

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

@@ -21,7 +21,7 @@ class ContributionBoundaryCallback @Inject constructor(
     @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler
 ) : BoundaryCallback<Contribution>() {
     private val compositeDisposable: CompositeDisposable = CompositeDisposable()
-    lateinit var userName: String
+    var userName: String? = null
 
 
     /**
@@ -53,13 +53,13 @@ class ContributionBoundaryCallback @Inject constructor(
     /**
      * Fetches contributions using the MediaWiki API
      */
-    fun fetchContributions() {
+    private fun fetchContributions() {
         if (sessionManager.userName != null) {
-            compositeDisposable.add(
-                mediaClient.getMediaListForUser(userName!!)
+            userName?.let { userName ->
+                mediaClient.getMediaListForUser(userName)
                     .map { mediaList ->
-                        mediaList.map {
-                            Contribution(media = it, state = Contribution.STATE_COMPLETED)
+                        mediaList.map { media ->
+                            Contribution(media = media, state = Contribution.STATE_COMPLETED)
                         }
                     }
                     .subscribeOn(ioThreadScheduler)
@@ -69,11 +69,13 @@ class ContributionBoundaryCallback @Inject constructor(
                             error.message
                         )
                     }
-            )
-        }else {
-            if (compositeDisposable != null){
-                compositeDisposable.clear()
+            }?.let {
+                compositeDisposable.add(
+                    it
+                )
             }
+        }else {
+            compositeDisposable.clear()
         }
     }
 

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

@@ -661,7 +661,7 @@ public Integer getContributionStateAt(int position) {
     }
 
     public boolean backButtonClicked() {
-        if (null != mediaDetailPagerFragment && mediaDetailPagerFragment.isVisible()) {
+        if (mediaDetailPagerFragment != null && mediaDetailPagerFragment.isVisible()) {
             if (store.getBoolean("displayNearbyCardView", true) && !isUserProfile) {
                 if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
                     nearbyNotificationCardView.setVisibility(View.VISIBLE);
@@ -678,9 +678,10 @@ public boolean backButtonClicked() {
             }else {
                 fetchCampaigns();
             }
-            if(getActivity() instanceof MainActivity) {
+            if (getActivity() instanceof MainActivity) {
                 // Fragment is associated with MainActivity
-                ((MainActivity)getActivity()).showTabs();
+                ((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+                ((MainActivity) getActivity()).showTabs();
             }
             return true;
         }

app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java

@@ -4,9 +4,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
-
 import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao;
-import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
 import fr.free.nrw.commons.category.CategoryDao;
@@ -16,7 +14,7 @@
 public class DBOpenHelper  extends SQLiteOpenHelper {
 
     private static final String DATABASE_NAME = "commons.db";
-    private static final int DATABASE_VERSION = 19;
+    private static final int DATABASE_VERSION = 20;
     public static final String CONTRIBUTIONS_TABLE = "contributions";
     private final String DROP_TABLE_STATEMENT="DROP TABLE IF EXISTS %s";
 

app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt

@@ -14,7 +14,7 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
  * The database for accessing the respective DAOs
  *
  */
-@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 12, exportSchema = false)
+@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 13, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun contributionDao(): ContributionDao

app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt

@@ -154,8 +154,7 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
                     buffer.append("}}, ")
                 }
             }
-            buffer.deleteCharAt(buffer.length - 1)
-            buffer.deleteCharAt(buffer.length - 1)
+            buffer.replace(", $".toRegex(), "")
             buffer.append(descriptionEnd)
         }
         val returningIntent = Intent()

app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java

@@ -12,6 +12,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import fr.free.nrw.commons.upload.FileUtils;
@@ -124,13 +126,30 @@ private DateTimeWithSource getFileCreatedDateFromCP(Context context) {
     private DateTimeWithSource getDateTimeFromExif() {
         try {
             ExifInterface exif = new ExifInterface(file.getAbsolutePath());
-            @SuppressLint("RestrictedApi") Long dateTime = exif.getDateTime();
-            if(dateTime != null){
-                Date date = new Date(dateTime);
-                return new DateTimeWithSource(date, DateTimeWithSource.EXIF_SOURCE);
+            // TAG_DATETIME returns the last edited date, we need TAG_DATETIME_ORIGINAL for creation date
+            // See issue https://github.com/commons-app/apps-android-commons/issues/1971
+            String dateTimeSubString = exif.getAttribute(ExifInterface.TAG_DATETIME_ORIGINAL);
+            if (dateTimeSubString!=null) { //getAttribute may return null
+                String year = dateTimeSubString.substring(0,4);
+                String month = dateTimeSubString.substring(5,7);
+                String day = dateTimeSubString.substring(8,10);
+                // This date is stored as a string (not as a date), the rason is we don't want to include timezones
+                String dateCreatedString = String.format("%04d-%02d-%02d", Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+                if (dateCreatedString.length() == 10) { //yyyy-MM-dd format of date is expected
+                    @SuppressLint("RestrictedApi") Long dateTime = exif.getDateTimeOriginal();
+                    if(dateTime != null){
+                        Date date = new Date(dateTime);
+                        return new DateTimeWithSource(date, dateCreatedString, DateTimeWithSource.EXIF_SOURCE);
+                    }
+                }
             }
+
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        } catch (IndexOutOfBoundsException e) {
+            e.printStackTrace();
         }
         return null;
     }
@@ -149,6 +168,7 @@ public class DateTimeWithSource {
         public static final String EXIF_SOURCE = "exif";
 
         private final long epochDate;
+        private String dateString; // this does not includes timezone information
         private final String source;
 
         public DateTimeWithSource(long epochDate, String source) {
@@ -161,10 +181,20 @@ public DateTimeWithSource(Date date, String source) {
             this.source = source;
         }
 
+        public DateTimeWithSource(Date date, String dateString, String source) {
+            this.epochDate = date.getTime();
+            this.dateString = dateString;
+            this.source = source;
+        }
+
         public long getEpochDate() {
             return epochDate;
         }
 
+        public String getDateString() {
+            return dateString;
+        }
+
         public String getSource() {
             return source;
         }