Change prefix of resources

auth0 · Sep 15, 2016 · f239d83 · f239d83
1 parent 59afb6c
commit f239d83
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/auth0/src/main/java/com/auth0/android/provider/AuthProvider.java b/auth0/src/main/java/com/auth0/android/provider/AuthProvider.java
@@ -177,9 +177,9 @@ public void onRequestPermissionsResult(@NonNull Activity activity, int requestCo
             requestAuth(activity, authenticationRequestCode);
         } else if (callback != null) {
             Log.e(TAG, "Permission Request failed. Some permissions were not granted!");
-            String message = String.format(activity.getString(R.string.com_auth0_lock_permission_missing_description), declinedPermissions);
+            String message = String.format(activity.getString(R.string.com_auth0_webauth_permission_missing_description), declinedPermissions);
             Dialog permissionDialog = new AlertDialog.Builder(activity)
-                    .setTitle(R.string.com_auth0_lock_permission_missing_title)
+                    .setTitle(R.string.com_auth0_webauth_permission_missing_title)
                     .setMessage(message)
                     .setPositiveButton(android.R.string.ok, null)
                     .create();

diff --git a/auth0/src/main/java/com/auth0/android/provider/WebAuthActivity.java b/auth0/src/main/java/com/auth0/android/provider/WebAuthActivity.java
@@ -42,6 +42,7 @@
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
@@ -71,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
             setFullscreenMode();
         }
 
-        setContentView(R.layout.com_auth0_lock_activity_web_auth);
+        setContentView(R.layout.com_auth0_activity_web_auth);
         final ActionBar bar = getSupportActionBar();
         if (bar != null) {
             String serviceName = getIntent().getStringExtra(CONNECTION_NAME_EXTRA);
@@ -113,7 +114,7 @@ public void onWindowFocusChanged(boolean hasFocus) {
 
     private void startUrlLoading() {
         if (!isNetworkAvailable()) {
-            renderLoadError(getString(R.string.com_auth0_lock_network_error));
+            renderLoadError(getString(R.string.com_auth0_webauth_network_error));
             return;
         }
 
@@ -178,9 +179,10 @@ public void onReceivedError(WebView view, WebResourceRequest request, WebResourc
             }
 
         });
-        webView.getSettings().setJavaScriptEnabled(true);
-        webView.getSettings().setSupportZoom(true);
-        webView.getSettings().setBuiltInZoomControls(true);
+        final WebSettings settings = webView.getSettings();
+        settings.setJavaScriptEnabled(true);
+        settings.setSupportZoom(true);
+        settings.setBuiltInZoomControls(true);
         webView.loadUrl(uri.toString());
     }
 

diff --git a/...yout/com_auth0_lock_activity_web_auth.xml → ...es/layout/com_auth0_activity_web_auth.xml b/...yout/com_auth0_lock_activity_web_auth.xml → ...es/layout/com_auth0_activity_web_auth.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ com_auth0_lock_activity_web_auth.xml
+  ~ com_auth0_activity_web_auth.xml
   ~
   ~ Copyright (c) 2016 Auth0 (http://auth0.com)
   ~
@@ -64,7 +64,7 @@
             android:layout_below="@id/com_auth0_lock_text"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
-            android:text="@string/com_auth0_lock_webview_loading_retry" />
+            android:text="@string/com_auth0_webauth_webview_loading_retry" />
 
     </RelativeLayout>
 

diff --git a/auth0/src/main/res/values/strings.xml b/auth0/src/main/res/values/strings.xml
@@ -23,9 +23,9 @@
   -->
 
 <resources>
-    <string name="com_auth0_lock_permission_missing_title">Missing permissions</string>
-    <string name="com_auth0_lock_permission_missing_description">Some permissions required by this provider were not granted. You can try to authenticate again or go to the application\'s permission screen in the phone settings and grant them. The missing permissions are:\n%s</string>
+    <string name="com_auth0_webauth_permission_missing_title">Missing permissions</string>
+    <string name="com_auth0_webauth_permission_missing_description">Some permissions required by this provider were not granted. You can try to authenticate again or go to the application\'s permission screen in the phone settings and grant them. The missing permissions are:\n%s</string>
 
-    <string name="com_auth0_lock_network_error">Network error</string>
-    <string name="com_auth0_lock_webview_loading_retry">Retry</string>
+    <string name="com_auth0_webauth_network_error">Network error</string>
+    <string name="com_auth0_webauth_webview_loading_retry">Retry</string>
 </resources>