Merge branch 'main' into hide-voice-input-when-not-available

Author: nicolas-raoul

app/src/main/AndroidManifest.xml

@@ -99,7 +99,6 @@
       android:exported="true"
       android:hardwareAccelerated="false"
       android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name"
       android:windowSoftInputMode="adjustResize">
       <intent-filter android:label="@string/intent_share_upload_label">
         <action android:name="android.intent.action.SEND" />
@@ -122,7 +121,7 @@
       android:name=".contributions.MainActivity"
       android:configChanges="screenSize|keyboard|orientation"
       android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name" />
+      />
     <activity
       android:name=".settings.SettingsActivity"
       android:label="@string/title_activity_settings" />

app/src/main/java/fr/free/nrw/commons/BaseMarker.kt

@@ -46,7 +46,7 @@ class BaseMarker {
         val drawable: Drawable = context.resources.getDrawable(drawableResId)
         icon =
             if (drawable is BitmapDrawable) {
-                (drawable as BitmapDrawable).bitmap
+                drawable.bitmap
             } else {
                 val bitmap =
                     Bitmap.createBitmap(

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

@@ -53,6 +53,7 @@
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import java.util.List;
+import java.util.Locale;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
@@ -301,7 +302,8 @@ private void bindViews() {
         modifyLocationButton = findViewById(R.id.modify_location);
         removeLocationButton = findViewById(R.id.remove_location);
         showInMapButton = findViewById(R.id.show_in_map);
-        showInMapButton.setText(getResources().getString(R.string.show_in_map_app).toUpperCase());
+        showInMapButton.setText(getResources().getString(R.string.show_in_map_app).toUpperCase(
+            Locale.ROOT));
         shadow = findViewById(R.id.location_picker_image_view_shadow);
     }
 

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

@@ -3,6 +3,7 @@ package fr.free.nrw.commons
 import android.os.Parcelable
 import fr.free.nrw.commons.location.LatLng
 import fr.free.nrw.commons.wikidata.model.page.PageTitle
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import java.util.Date
 import java.util.Locale
@@ -124,6 +125,7 @@ class Media constructor(
      * Gets the categories the file falls under.
      * @return file categories as an ArrayList of Strings
      */
+    @IgnoredOnParcel
     var addedCategories: List<String>? = null
         // TODO added categories should be removed. It is added for a short fix. On category update,
         //  categories should be re-fetched instead

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

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.bookmarks.items;
 
+import android.annotation.SuppressLint;
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -134,6 +135,7 @@ public boolean findBookmarkItem(final String depictedItemID) {
      * @param cursor : Object for storing database data
      * @return DepictedItem
      */
+    @SuppressLint("Range")
     DepictedItem fromCursor(final Cursor cursor) {
         final String fileName = cursor.getString(cursor.getColumnIndex(Table.COLUMN_NAME));
         final String description

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

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.bookmarks.locations;
 
+import android.annotation.SuppressLint;
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -146,6 +147,7 @@ public boolean findBookmarkLocation(Place bookmarkLocation) {
         return false;
     }
 
+    @SuppressLint("Range")
     @NonNull
     Place fromCursor(final Cursor cursor) {
         final LatLng location = new LatLng(cursor.getDouble(cursor.getColumnIndex(Table.COLUMN_LAT)),

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

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.bookmarks.pictures;
 
+import android.annotation.SuppressLint;
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -150,6 +151,7 @@ public boolean findBookmark(Bookmark bookmark) {
         return false;
     }
 
+    @SuppressLint("Range")
     @NonNull
     Bookmark fromCursor(Cursor cursor) {
         String fileName = cursor.getString(cursor.getColumnIndex(Table.COLUMN_MEDIA_NAME));

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

@@ -124,7 +124,7 @@ class CategoryClient
                 }.map {
                     it
                         .filter { page ->
-                            page.categoryInfo() == null || !page.categoryInfo().isHidden
+                            !page.categoryInfo().isHidden
                         }.map {
                             CategoryItem(
                                 it.title().replace(CATEGORY_PREFIX, ""),

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

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.category;
 
+import android.annotation.SuppressLint;
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -111,6 +112,7 @@ List<CategoryItem> recentCategories(int limit) {
     }
 
     @NonNull
+    @SuppressLint("Range")
     Category fromCursor(Cursor cursor) {
         // Hardcoding column positions!
         return new Category(

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

@@ -22,7 +22,7 @@ class WikipediaInstructionsDialogFragment : DialogFragment() {
     ) = DialogAddToWikipediaInstructionsBinding
         .inflate(inflater, container, false)
         .apply {
-            val contribution: Contribution? = arguments!!.getParcelable(ARG_CONTRIBUTION)
+            val contribution: Contribution? = requireArguments().getParcelable(ARG_CONTRIBUTION)
             tvWikicode.setText(contribution?.media?.wikiCode)
             instructionsCancel.setOnClickListener { dismiss() }
             instructionsConfirm.setOnClickListener {