Merge remote-tracking branch 'refs/remotes/origin/2.8-release'

Author: misaochan

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

@@ -276,17 +276,25 @@ private void setUploadCount() {
                 .getUploadCount(sessionManager.getCurrentAccount().name)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        uploadCount -> getSupportActionBar().setSubtitle(getResources()
-                                .getQuantityString(R.plurals.contributions_subtitle,
-                                        uploadCount, uploadCount)),
+                .subscribe(this::displayUploadCount,
                         t -> Timber.e(t, "Fetching upload count failed")
                 ));
     }
 
-    public void betaSetUploadCount(int betaUploadCount){
+    private void displayUploadCount(Integer uploadCount) {
+        if (isFinishing()
+                || getSupportActionBar() == null
+                || getResources() == null) {
+            return;
+        }
+        
         getSupportActionBar().setSubtitle(getResources()
-                .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount));
+                .getQuantityString(R.plurals.contributions_subtitle,
+                        uploadCount, uploadCount));
+    }
+
+    public void betaSetUploadCount(int betaUploadCount) {
+        displayUploadCount(betaUploadCount);
     }
 
 

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

@@ -74,13 +74,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
             //What happens when the 'submit' icon is tapped
             case R.id.menu_upload_single:
 
-                if (titleEdit.getText().toString().isEmpty()) {
+                if (titleEdit.getText().toString().trim().isEmpty()) {
                     Toast.makeText(getContext(), R.string.add_title_toast, Toast.LENGTH_LONG).show();
                     return false;
                 }
 
-                String title = titleEdit.getText().toString();
-                String desc = descEdit.getText().toString();
+                String title = titleEdit.getText().toString().trim();
+                String desc = descEdit.getText().toString().trim();
 
                 //Save the title/desc in short-lived cache so next time this fragment is loaded, we can access these
                 prefs.edit()

app/src/main/res/values/strings.xml

@@ -284,7 +284,7 @@
   <string name="error_fetching_nearby_places">Error fetching nearby places.</string>
 
   <string name="successful_wikidata_edit">Image successfully added to %1$s on Wikidata!</string>
-  <string name="wikidata_edit_failure">Failed to update corresponding wiki data entity!</string>
+  <string name="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string>
   <string name="menu_set_wallpaper">Set wallpaper</string>
   <string name="wallpaper_set_successfully">Wallpaper set successfully!</string>
 </resources>