Эх сурвалжийг харах

changes due to CR

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 жил өмнө
parent
commit
7ed4e2b24e

+ 9 - 10
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -372,15 +372,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (mLoginWebView != null && event.getAction() == KeyEvent.ACTION_DOWN) {
-            if (keyCode == KeyEvent.KEYCODE_BACK) {
-                if (mLoginWebView.canGoBack()) {
-                    mLoginWebView.goBack();
-                } else {
-                    finish();
-                }
-                return true;
+        if (mLoginWebView != null && event.getAction() == KeyEvent.ACTION_DOWN &&
+            keyCode == KeyEvent.KEYCODE_BACK) {
+            if (mLoginWebView.canGoBack()) {
+                mLoginWebView.goBack();
+            } else {
+                finish();
             }
+            return true;
         }
         return super.onKeyDown(keyCode, event);
     }
@@ -458,7 +457,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             webViewPassword = loginUrlInfo.password;
         } catch (Exception e) {
             mServerStatusIcon = R.drawable.ic_alert;
-            mServerStatusText = "QR Code could not be read!";
+            mServerStatusText = getString(R.string.qr_could_not_be_read);
             showServerStatus();
         }
         checkOcServer();
@@ -1400,7 +1399,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                         doOnResumeAndBound();
                     } catch (Exception e) {
                         mServerStatusIcon = R.drawable.ic_alert;
-                        mServerStatusText = "QR Code could not be read!";
+                        mServerStatusText = getString(R.string.qr_could_not_be_read);
                         showServerStatus();
                     }
                 } else {

+ 1 - 0
src/main/res/values/strings.xml

@@ -926,4 +926,5 @@
     <string name="thumbnail_for_existing_file_description">Thumbnail for existing file</string>
     <string name="invalid_url">Invalid URL</string>
     <string name="conflict_dialog_error">Error creating conflict dialog!</string>
+    <string name="qr_could_not_be_read">QR Code could not be read!</string>
 </resources>