lp:~trb143/openlp/android-2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/android at revision 49

Johan Mynhardt: Approve on 2013-04-07

Diff: 1238 lines (+447/-324)

26 files modified

AndroidManifest.xml (+2/-2)
res/values/defaultValues.xml (+2/-0)
res/values/keyStrings.xml (+2/-0)
res/values/strings.xml (+9/-0)
src/org/openlp/android/OpenLP.java (+2/-2)
src/org/openlp/android/activity/DefaultActivity.java (+2/-2)
src/org/openlp/android/activity/OpenLPNavigate.java (+2/-2)
src/org/openlp/android/activity/PagerActivity.java (+2/-2)
src/org/openlp/android/activity/Search.java (+2/-2)
src/org/openlp/android/activity/SearchService.java (+2/-2)
src/org/openlp/android/activity/SearchableActivity.java (+2/-2)
src/org/openlp/android/activity/preference/ConnectionPreferenceActivity.java (+49/-12)
src/org/openlp/android/activity/preference/Preferences.java (+2/-2)
src/org/openlp/android/api/Api.java (+2/-2)
src/org/openlp/android/data/HttpReturn.java (+53/-0)
src/org/openlp/android/data/Poll.java (+2/-2)
src/org/openlp/android/data/SlideItem.java (+2/-2)
src/org/openlp/android/service/ApiCallIntent.java (+247/-263)
src/org/openlp/android/service/PingIntent.java (+2/-2)
src/org/openlp/android/utility/GroupExpandableListAdapter.java (+2/-2)
src/org/openlp/android/utility/JSONHandler.java (+2/-2)
src/org/openlp/android/utility/OpenLPController.java (+14/-3)
src/org/openlp/android/utility/OpenLPHttpClient.java (+35/-10)
src/org/openlp/android/utility/SlideAdapter.java (+2/-2)
src/org/openlp/android/utility/StringHelper.java (+2/-2)
src/org/openlp/android/utility/WebCallReturningAsyncTask.java (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

51. By Tim Bentley on 2013-04-07

Text string cleanups for translations

50. By Tim Bentley on 2013-04-06

Fix copyright dates and refactor return data and error codes

49. By Tim Bentley on 2013-04-06

Make SSL work and initial Authentication changes

48. By Tim Bentley on 2013-03-12

Updates for version 1

47. By Tim Bentley on 2012-07-31

fix display bug

46. By Tim Bentley on 2012-07-02

Update translations

45. By Tim Bentley on 2012-06-17

Fix up merge mess 2

44. By Tim Bentley on 2012-06-17

Fix up merge mess

43. By Tim Bentley on 2012-06-17

Prevent SSL Selection for now

42. By Johan Mynhardt on 2012-06-03

Revised Preferences