Fix 2FA login (#3170)

Author: Vivek Maskara

app/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     implementation 'com.facebook.fresco:fresco:1.13.0'
     implementation 'com.drewnoakes:metadata-extractor:2.11.0'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
-    implementation 'com.github.maskaravivek:wikimedia-android-data-client:v0.0.27'
+    implementation 'com.github.maskaravivek:wikimedia-android-data-client:v0.0.28'
 
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -1,10 +1,5 @@
 package fr.free.nrw.commons.auth;
 
-import static android.view.KeyEvent.KEYCODE_ENTER;
-import static android.view.View.VISIBLE;
-import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
-import static fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_WIKI_SITE;
-
 import android.accounts.AccountAuthenticatorActivity;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -18,9 +13,11 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -29,12 +26,25 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.NavUtils;
 import androidx.core.content.ContextCompat;
+
+import com.google.android.material.textfield.TextInputLayout;
+
+import org.wikipedia.AppAdapter;
+import org.wikipedia.dataclient.ServiceFactory;
+import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import org.wikipedia.login.LoginClient;
+import org.wikipedia.login.LoginClient.LoginCallback;
+import org.wikipedia.login.LoginResult;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnEditorAction;
 import butterknife.OnFocusChange;
-import com.google.android.material.textfield.TextInputLayout;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
@@ -47,20 +57,16 @@
 import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.disposables.CompositeDisposable;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.wikipedia.AppAdapter;
-import org.wikipedia.dataclient.ServiceFactory;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.dataclient.mwapi.MwQueryResponse;
-import org.wikipedia.login.LoginClient;
-import org.wikipedia.login.LoginClient.LoginCallback;
-import org.wikipedia.login.LoginResult;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 import timber.log.Timber;
 
+import static android.view.KeyEvent.KEYCODE_ENTER;
+import static android.view.View.VISIBLE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
+import static fr.free.nrw.commons.di.NetworkingModule.NAMED_COMMONS_WIKI_SITE;
+
 public class LoginActivity extends AccountAuthenticatorActivity {
 
     @Inject
@@ -383,6 +389,9 @@ public void askUserForTwoFactorAuth() {
         progressDialog.dismiss();
         twoFactorContainer.setVisibility(VISIBLE);
         twoFactorEdit.setVisibility(VISIBLE);
+        twoFactorEdit.requestFocus();
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
         showMessageAndCancelDialog(R.string.login_failed_2fa_needed);
     }
 

app/src/main/res/layout-land/activity_login.xml

@@ -150,7 +150,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/_2fa_code"
                         android:imeOptions="flagNoExtractUi"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="number"
                         android:visibility="gone"
                         tools:visibility="visible" />
 

app/src/main/res/layout-xlarge/activity_login.xml

@@ -151,7 +151,7 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/_2fa_code"
                             android:imeOptions="flagNoExtractUi"
-                            android:inputType="textNoSuggestions"
+                            android:inputType="number"
                             android:visibility="gone"
                             tools:visibility="visible" />
 

app/src/main/res/layout/activity_login.xml

@@ -156,7 +156,7 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/_2fa_code"
                         android:imeOptions="flagNoExtractUi"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="number"
                         android:visibility="gone"
                         tools:visibility="visible" />