Merge lp:~tomdroid-dev/tomdroid/check-for-linebreak into lp:~tomdroid-maintainers/tomdroid/main

[Stefan Hammer]

fixes bug #902855.

[lp:~tomdroid-dev/tomdroid/check-for-linebreak]

287. By Stefan Hammer on 2012-04-01

modified NEWS entry to save Olivier some work :-)

288. By Stefan Hammer on 2012-04-01

adding singleline=true is a better fix. Further, checking for tabs and spaces also avoids crashing

289. By Stefan Hammer on 2012-04-01

wicht copy/paste linebreaks could also go in... it is more save to also check for them. Now I am really done.

[Olivier Bilodeau (plaxx)]

merge!

review: Approve

=== modified file 'NEWS'
--- NEWS	2012-03-31 22:07:31 +0000
+++ NEWS	2012-04-01 13:30:25 +0000
@@ -13,6 +13,7 @@
 
 -------------------------------------------------------------------------------
 Versoin 0.?? released on ??
+* Fix crash when authenticating a server URL that includes newline (Stefan Hammer, lp:902855)
 * Can specify folder for SD Card Sync (ie: dropbox) (Stefan Hammer, lp:837119)
 * Creating home-screen shortcuts to notes is now possible (Piotr Adamski, 
   lp:882703)
 
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2012-03-31 21:13:15 +0000
+++ res/values/strings.xml	2012-04-01 13:30:25 +0000
@@ -57,7 +57,7 @@
 	<string name="prefAuthenticate">Authenticate</string>
 	<string name="prefLocation">Location on SD Card</string>
 	<string name="prefFolderCreated">The folder \"%1$s\" does not exist yet. Please connect your device to the computer, create the folder and fill it with *.note files.</string>
-	<string name="prefNoValidLocation">\"%1$s\" is no valid folder location. Please try again!</string>
+	<string name="prefNoValidEntry">\"%1$s\" contains invalid characters.\nPlease try again!</string>
 	
 	<string name="prefSyncCompleteAuth">Completing authentication. Please wait...</string>
 	<string name="prefSyncConnectionFailed">The connection to the server has failed, please check that the address you entered is correct.</string>
 
=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	2012-01-12 12:14:57 +0000
+++ res/xml/preferences.xml	2012-04-01 13:30:25 +0000
@@ -33,12 +33,14 @@
 		<EditTextPreference android:key="sync_server"
 							android:title="@string/prefSyncServer"
 							android:positiveButtonText="@string/prefAuthenticate"
-							android:shouldDisableView="true"/>
+							android:shouldDisableView="true"
+							android:singleLine="true"/>
 		
 		<EditTextPreference android:key="sd_location"
 							android:title="@string/prefLocation"
 							android:positiveButtonText="@string/btnOk"
-							android:shouldDisableView="true"/>
+							android:shouldDisableView="true"
+							android:singleLine="true"/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/prefSearch">
 		<Preference
 
=== modified file 'src/org/tomdroid/ui/PreferencesActivity.java'
--- src/org/tomdroid/ui/PreferencesActivity.java	2012-03-31 21:08:34 +0000
+++ src/org/tomdroid/ui/PreferencesActivity.java	2012-04-01 13:30:25 +0000
@@ -112,6 +112,10 @@
 							Toast.LENGTH_SHORT).show();
 					return false;
 				}
+				if ((serverUri.toString().contains("\t")) || (serverUri.toString().contains(" ")) || (serverUri.toString().contains("\n"))){
+					noValidEntry(serverUri.toString());
+					return false;
+				}
 			    
 				authenticate((String) serverUri);
 				return true;
@@ -127,8 +131,8 @@
 				if (locationUri.equals(Preferences.getString(Preferences.Key.SD_LOCATION))) { 
 					return false;
 				}
-				if (locationUri.toString().contains("\n")) { 
-					noValidLocation(locationUri.toString());
+				if ((locationUri.toString().contains("\t")) || (locationUri.toString().contains("\n"))) { 
+					noValidEntry(locationUri.toString());
 					return false;
 				}
 				
@@ -277,6 +281,7 @@
 	
 	private void folderNotExisting(String path) {
 		new AlertDialog.Builder(this)
+			.setTitle(getString(R.string.error))
 			.setMessage(String.format(getString(R.string.prefFolderCreated), path))
 			.setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
 				public void onClick(DialogInterface dialog, int which) {
@@ -285,9 +290,10 @@
 			.show();
 	}
 	
-	private void noValidLocation(String path) {
+	private void noValidEntry(String Entry) {
 		new AlertDialog.Builder(this)
-			.setMessage(String.format(getString(R.string.prefNoValidLocation), path))
+			.setTitle(getString(R.string.error))
+			.setMessage(String.format(getString(R.string.prefNoValidEntry), Entry))
 			.setNeutralButton(getString(R.string.btnOk), new OnClickListener() {
 				public void onClick(DialogInterface dialog, int which) {
 					dialog.dismiss();