brander: support for custom weblogin urls

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -368,14 +368,18 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mLoginWebView.getSettings().setSaveFormData(false);
         mLoginWebView.getSettings().setSavePassword(false);
 
-        if (baseURL != null && !baseURL.isEmpty()){
-            Map<String, String> headers = new HashMap<>();
-            headers.put(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE);
-            mLoginWebView.loadUrl(baseURL + WEB_LOGIN, headers);
+        Map<String, String> headers = new HashMap<>();
+        headers.put(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE);
+
+        String url;
+        if (baseURL != null && !baseURL.isEmpty()) {
+            url = baseURL + WEB_LOGIN;
         } else {
-            mLoginWebView.loadUrl(getResources().getString(R.string.webview_login_url));
+            url = getResources().getString(R.string.webview_login_url);
         }
 
+        mLoginWebView.loadUrl(url, headers);
+
         mLoginWebView.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {

src/main/res/values/setup.xml

@@ -132,7 +132,7 @@
 
     <!-- login data links -->
     <string name="login_data_own_scheme" translatable="false">nc</string>
-    <!-- url for webview login, with the protocol prefix
+    <!-- url for webview login, with the protocol prefix and with full url (normally /index.php/login/flow)
     If set, will replace all other login methods available -->
     <string name="webview_login_url" translatable="false"></string>