Fix keyboard state for license screen

Author: maskara

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

@@ -35,16 +35,16 @@
 
 class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapter.ViewHolder> {
 
-    Title title;
-    List<Description> descriptions;
+    private Title title;
+    private List<Description> descriptions;
     private Context context;
     private Callback callback;
     private Subject<String> titleChangedSubject;
 
     private BiMap<AdapterView, String> selectedLanguages;
     private UploadView uploadView;
 
-    public DescriptionsAdapter(UploadView uploadView) {
+    DescriptionsAdapter(UploadView uploadView) {
         title = new Title();
         descriptions = new ArrayList<>();
         descriptions.add(new Description());
@@ -53,11 +53,11 @@ public DescriptionsAdapter(UploadView uploadView) {
         this.uploadView = uploadView;
     }
 
-    public void setCallback(Callback callback) {
+    void setCallback(Callback callback) {
         this.callback = callback;
     }
 
-    public void setItems(Title title, List<Description> descriptions) {
+    void setItems(Title title, List<Description> descriptions) {
         this.descriptions = descriptions;
         this.title = title;
         selectedLanguages = new BiMap<>();
@@ -95,11 +95,11 @@ public int getItemCount() {
         return descriptions.size() + 1;
     }
 
-    public List<Description> getDescriptions() {
+    List<Description> getDescriptions() {
         return descriptions;
     }
 
-    public void addDescription(Description description) {
+    void addDescription(Description description) {
         this.descriptions.add(description);
         notifyItemInserted(descriptions.size() + 1);
     }

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

@@ -3,10 +3,8 @@
 import android.Manifest;
 import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -19,7 +17,6 @@
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-import android.util.AttributeSet;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
@@ -307,6 +304,7 @@ public void setBottomCardVisibility(@UploadPage int page) {
             viewFlipper.setDisplayedChild(1);
         } else if (page == LICENSE) {
             viewFlipper.setDisplayedChild(2);
+            dismissKeyboard();
         } else if (page == PLEASE_WAIT) {
             viewFlipper.setDisplayedChild(3);
         }
@@ -332,7 +330,12 @@ public void setBackground(Uri mediaUri) {
 
     @Override
     public void dismissKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
 
+        // verify if the soft keyboard is open
+        if (imm != null && imm.isAcceptingText() && getCurrentFocus() != null) {
+            imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+        }
     }
 
     @Override

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

@@ -38,10 +38,6 @@ public class UploadModel {
 
     private MediaWikiApi mwApi;
     private static UploadItem DUMMY = new UploadItem(Uri.EMPTY, "", "", GPSExtractor.DUMMY, "", null,-1l) {
-        @Override
-        public boolean isDummy() {
-            return true;
-        }
     };
     private final SharedPreferences prefs;
     private final List<String> licenses;
@@ -374,19 +370,13 @@ static class UploadItem {
             descriptions = new ArrayList<>();
             descriptions.add(new Description());
             this.wikidataEntityId = wikidataEntityId;
-
             this.mediaUri = mediaUri;
             this.mimeType = mimeType;
             this.source = source;
             this.gpsCoords = gpsCoords;
             this.fileExt = fileExt;
             imageQuality = BehaviorSubject.createDefault(ImageUtils.IMAGE_WAIT);
             this.createdTimestamp=createdTimestamp;
-//                imageQuality.subscribe(iq->Timber.i("New value of imageQuality:"+ImageUtils.IMAGE_OK));
-        }
-
-        public boolean isDummy() {
-            return false;
         }
     }