openlp-android team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Android Developers (openlp-android)

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

Fix the default initialisation 
Couple of code cleanups
Working apk file (test certificate).
-- 
https://code.launchpad.net/~trb143/openlp/android_05/+merge/104857
Your team OpenLP Android Developers is requested to review the proposed merge of lp:~trb143/openlp/android_05 into lp:openlp/android.

=== modified file '.project'
--- .project	2011-03-08 21:02:48 +0000
+++ .project	2012-05-06 15:58:18 +0000
@@ -1,33 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OpenlpRemote</name>
-	<comment></comment>
-	<projects>
-	</projects>
+	<name>Openlp</name>
+	<comment/>
+	<projects/>
 	<buildSpec>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
+			<arguments/>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

=== modified file 'OpenLP.apk'
Binary files OpenLP.apk	2012-04-22 09:16:42 +0000 and OpenLP.apk	2012-05-06 15:58:18 +0000 differ
=== modified file 'res/values/defaultValues.xml'
--- res/values/defaultValues.xml	2012-05-05 17:29:57 +0000
+++ res/values/defaultValues.xml	2012-05-06 15:58:18 +0000
@@ -7,6 +7,6 @@
     <!-- INTEGER -->
     <integer name="socketTimeoutDefaultValue">3000</integer>
     <integer name="connectionTimeoutDefaultValue">3000</integer>
-    <string name="backgroundRefreshDefaultValue">3600</string>
+    <string name="backgroundRefreshDefaultValue">5000</string>
     <integer name="textSizeDefaultValue">14</integer>    
 </resources>

=== modified file 'src/org/openlp/android/service/ApiCallIntent.java'
--- src/org/openlp/android/service/ApiCallIntent.java	2012-05-05 14:12:12 +0000
+++ src/org/openlp/android/service/ApiCallIntent.java	2012-05-06 15:58:18 +0000
@@ -197,7 +197,7 @@
 		URISyntaxException {
 		String request =
 			JSONHandler.createRequestJSON("id", Integer.toString(position));
-		Intent apiCallreceivereIntent =
+		Intent apiCallreceiverIntent =
 			new WebCallReceiverIntent(apiBase, request);
 		OpenLPHttpClient httpClient = getApiConfiguredClient(apiBase, request);
 
@@ -207,7 +207,7 @@
 				"Unexpected null result while setting list data. apiBase(%s), position(%s)",
 				apiBase, position);
 			Log.e(LOG_TAG, message);
-			apiCallreceivereIntent = new WebCallReceiverIntent(
+			apiCallreceiverIntent = new WebCallReceiverIntent(
 				new WebCallReceiverIntentError(
 					"Unexpected null result while setting list data."));
 		}
@@ -215,7 +215,7 @@
 			Log.d(LOG_TAG, "setData result: " + result);
 		}
 
-		return apiCallreceivereIntent;
+		return apiCallreceiverIntent;
 	}
 
 	private Intent executePoll() throws IOException, URISyntaxException,

=== modified file 'src/org/openlp/android/service/PingIntent.java'
--- src/org/openlp/android/service/PingIntent.java	2012-05-05 14:12:12 +0000
+++ src/org/openlp/android/service/PingIntent.java	2012-05-06 15:58:18 +0000
@@ -70,13 +70,13 @@
 
 		@Override
 		public void run() {
-			Intent apiCallPingIntent =
-				new Intent(getApplicationContext(), ApiCallIntent.class);
-			apiCallPingIntent.putExtra(Api.POLL_STATUS, "");
-			startService(apiCallPingIntent);
-			if (delay > 0) {
-				handler.postDelayed(r, delay);
-			}
+        Intent apiCallPingIntent =
+            new Intent(getApplicationContext(), ApiCallIntent.class);
+        apiCallPingIntent.putExtra(Api.POLL_STATUS, "");
+        startService(apiCallPingIntent);
+        if (delay > 0) {
+            handler.postDelayed(r, delay);
+        }
 		}
 	};