openlp-android team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/android_04 into lp:openlp/android.

Requested reviews:
  OpenLP Android Developers (openlp-android)
Related bugs:
  Bug #908226 in OpenLP: "Traceback when sending # or ; character from remote search or alert field"
  https://bugs.launchpad.net/openlp/+bug/908226

For more details, see:
https://code.launchpad.net/~trb143/openlp/android_04/+merge/97278

Fix encoding errors before sending to OpenLP
-- 
https://code.launchpad.net/~trb143/openlp/android_04/+merge/97278
Your team OpenLP Android Developers is requested to review the proposed merge of lp:~trb143/openlp/android_04 into lp:openlp/android.

=== modified file 'src/org/openlp/android/activity/Alert.java'
--- src/org/openlp/android/activity/Alert.java	2012-03-04 17:20:44 +0000
+++ src/org/openlp/android/activity/Alert.java	2012-03-13 19:08:18 +0000
@@ -20,6 +20,9 @@
  *******************************************************************************/
 package org.openlp.android.activity;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
@@ -51,9 +54,17 @@
 			String alert;
 			try {
 				if (edittext.getText().toString().trim().length() > 0) {
-					alert = JSONHandler.createRequestJSON("text", edittext
-						.getText().toString());
-					new WebCallAsyncTask(context, ALERT).execute(alert);
+					try {
+						alert = JSONHandler.createRequestJSON("text", 
+							URLEncoder.encode(edittext
+							.getText().toString(), "utf-8"));
+						new WebCallAsyncTask(context, ALERT).execute(alert);						
+					}
+					catch (UnsupportedEncodingException e) {
+						Toast.makeText(context, R.string.jsonfail,
+								Toast.LENGTH_LONG).show();
+						Log.e(LOG_TAG, e.toString());
+					}
 				}
 				else {
 					Toast.makeText(getBaseContext(),

=== modified file 'src/org/openlp/android/activity/SearchableActivity.java'
--- src/org/openlp/android/activity/SearchableActivity.java	2012-03-04 17:20:44 +0000
+++ src/org/openlp/android/activity/SearchableActivity.java	2012-03-13 19:08:18 +0000
@@ -43,6 +43,8 @@
 import org.openlp.android.utility.WebCallAsyncTask;
 import org.openlp.android.utility.WebCallReturningAsyncTask;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -86,7 +88,15 @@
 
 		Intent intent = getIntent();
 		if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-			String query = intent.getStringExtra(SearchManager.QUERY);
+			String query = ""; 
+			try {
+				query = URLEncoder.encode(intent.getStringExtra(SearchManager.QUERY), "utf-8");
+			}
+			catch (UnsupportedEncodingException e) {
+				Toast.makeText(context, R.string.jsonfail,
+						Toast.LENGTH_LONG).show();
+				Log.e(LOG_TAG, e.toString());
+			}
 			doSearch(query);
 		}
 	}