Post merge

Author: ashishkumar468

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

@@ -84,13 +84,14 @@ 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 descriptionsInVariousLanguages = getDescriptionsInAppropriateFormat();
+
+                String title = titleEdit.getText().toString().trim();
+                String desc = getDescriptionsInAppropriateFormat();
 
                 //Save the title/desc in short-lived cache so next time this fragment is loaded, we can access these
                 prefs.edit()
@@ -100,7 +101,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                         .apply();
 
                 uploadActionInitiatedHandler
-                        .uploadActionInitiated(title, descriptionsInVariousLanguages);
+                        .uploadActionInitiated(title,desc);
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -118,11 +119,6 @@ private String getDescriptionsInAppropriateFormat() {
 
     }
 
-    private List<Description> getDescriptions() {
-        List<Description> descriptions = descriptionsAdapter.getDescriptions();
-        return descriptions;
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
            Bundle savedInstanceState) {
@@ -348,12 +344,10 @@ private String licenseUrlFor(String license) {
     }
 
     public interface OnUploadActionInitiated {
-
         void uploadActionInitiated(String title, String description);
     }
 
     private class TitleTextWatcher implements TextWatcher {
-
         @Override
         public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
         }