openlp-android team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Android Developers (openlp-android)

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

a
-- 
https://code.launchpad.net/~trb143/openlp/android_dev/+merge/110695
Your team OpenLP Android Developers is requested to review the proposed merge of lp:~trb143/openlp/android_dev into lp:openlp/android.

=== modified file 'OpenLP.apk'
Binary files OpenLP.apk	2012-06-02 14:44:11 +0000 and OpenLP.apk	2012-06-17 17:41:19 +0000 differ
=== modified file 'src/org/openlp/android/activity/preference/ConnectionPreferenceActivity.java'
--- src/org/openlp/android/activity/preference/ConnectionPreferenceActivity.java	2012-06-17 15:11:44 +0000
+++ src/org/openlp/android/activity/preference/ConnectionPreferenceActivity.java	2012-06-17 17:41:19 +0000
@@ -299,6 +299,7 @@
 			useSsl.setTitle(getString(R.string.connection_profile_ssl_use));
 			useSsl.setSummary(getString(R.string.connection_profile_ssl_summary));
 			useSsl.setKey(KEY_PREFIX + id + ".usessl");
+
             // Only till SSL is added to core
             useSsl.setEnabled(false);