Merge branch 'develop' into fix_noti_and_round_avatar

app/src/main/java/chat/rocket/android/helper/KeyboardHelper.java

@@ -7,9 +7,10 @@ import android.view.inputmethod.InputMethodManager;
 
 public class KeyboardHelper {
   public static void hideSoftKeyboard(Activity activity) {
-    if (activity.getCurrentFocus() != null) {
+    View currentFocus = activity.getCurrentFocus();
+    if (currentFocus != null) {
       InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-      inputMethodManager.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), 0);
+      inputMethodManager.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
     }
   }
 
@@ -23,4 +24,4 @@ public class KeyboardHelper {
     InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
     inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
   }
-}
+}
\ No newline at end of file

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

@@ -38,7 +38,7 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/two_factor_code"
                     android:imeOptions="actionNext"
-                    android:inputType="textWebEmailAddress"
+                    android:inputType="number"
                     android:maxLines="1" />
         </android.support.design.widget.TextInputLayout>