From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 6 Nov 2013 10:43:22 +0000 (+0100)
Subject: Merge branch 'develop' into setup_buttons
X-Git-Tag: oc-android-1.5.5~139^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a0efedc99d0421554b8f8e93ef631e54a4cb05cd?ds=inline

Merge branch 'develop' into setup_buttons
---

a0efedc99d0421554b8f8e93ef631e54a4cb05cd
diff --cc res/values/setup.xml
index 2092c3f3,31df6da2..a2fb403f
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -9,10 -9,10 +9,11 @@@
      <string name ="data_folder">owncloud</string>
      <string name ="log_name">Owncloud_</string>
      
-     <!-- Server URL -->
+     <!-- URLs and flags related -->
      <string name="server_url"></string>
      <bool name="show_server_url_input">true</bool>
 -	<string name="url_account_register">"https://owncloud.com/mobile/new"</string>
 +    <bool name="show_welcome_link">true</bool>
++	<string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>
      
      <!-- Flags to setup the authentication methods available in the app -->
      <string name="auth_method_oauth2">off</string>
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index f6c21e2f,53f18bb4..8f7fc2c2
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -1402,7 -1397,7 +1402,7 @@@ implements  OnRemoteOperationListener, 
       * @param view      'Account register' button
       */
      public void onRegisterClick(View view) {
--        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));
++        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));
          setResult(RESULT_CANCELED);
          startActivity(register);
      }