From 081b333eb1534733bea5e8b837616ba5ee565d43 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Mon, 20 Aug 2012 14:36:46 +0200
Subject: [PATCH] Added link to register a new user at owncloud.com ; fixed
 cancel button in account creation for SGS3

---
 AndroidManifest.xml                                 |  4 ++--
 res/layout/account_setup.xml                        | 21 ++++++++++++++++++---
 res/values/strings.xml                              |  1 +
 .../android/ui/activity/AuthenticatorActivity.java  |  8 ++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eda2b139..bf7795ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="103005"
-    android:versionName="1.3.5" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="103006"
+    android:versionName="1.3.6" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 5f128722..b26942b0 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -140,16 +140,16 @@
 
             </FrameLayout>
 
-        </LinearLayout>
+            </LinearLayout>
 
     </FrameLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true" >
+        android:layout_height="wrap_content">
 
         <LinearLayout
+            android:id="@+id/buttons_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:weightSum="1" >
@@ -173,6 +173,21 @@
                 android:textColor="@android:color/black" />
 
         </LinearLayout>
+        
+		<Button
+			android:id="@+id/account_register"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/buttons_layout"
+			android:layout_centerHorizontal="true"
+			android:onClick="onRegisterClick"
+			android:paddingTop="10dp"
+			android:paddingBottom="10dp"
+			android:textColor="#0000FF"
+			android:background="@android:color/transparent"
+			android:text="@string/auth_register" />
+            
+        
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0b9b0b1a..89e749f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="auth_host_url">ownCloud URL</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
+    <string name="auth_register">I am new at ownCloud</string>
     <string name="new_session_uri_error">Wrong URL given</string>
     <string name="new_session_session_name_error">Wrong session name</string>
     <string name="sync_string_files">Files</string>
diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
index a71f65b8..a1098094 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -41,6 +41,7 @@ import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -228,6 +229,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
     }
     public void onCancelClick(View view) {
+        setResult(RESULT_CANCELED);
         finish();
     }
     
@@ -246,6 +248,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
         continueConnection(prefix);
     }
+    
+    public void onRegisterClick(View view) {
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse("https://owncloud.com/mobile/new"));
+        setResult(RESULT_CANCELED);
+        startActivity(register);
+    }
 
     private void continueConnection(String prefix) {
         String url = ((TextView) findViewById(R.id.host_URL)).getText()
-- 
2.11.0