OpenLP

Merge lp://qastaging/~trb143/openlp/android-2 into lp://qastaging/openlp/android

  1. android-2
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: 49
Proposed branch: lp://qastaging/~trb143/openlp/android-2
Merge into: lp://qastaging/openlp/android
Diff against target: 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)
To merge this branch: bzr merge lp://qastaging/~trb143/openlp/android-2
Reviewer Review Type Date Requested Status
Johan Mynhardt Approve
Review via email: mp+157543@code.qastaging.launchpad.net

Description of the change

Fix up the SSL code to work with CherryPy
Add Userid and Password to config and HTTPCLient
Fix up error handling to work better
Move display strings to translatables.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Userid and password are saveed in config but cannot be read in client.
Not sure why this is happning any clues Johan

Revision history for this message
Johan Mynhardt (johanmynhardt) wrote :

Ok, got my stuff up and running.

@trb143: it appears to be working for me:

* if I activate user Authentication and set the username and password to something different (matching between remote and openlp) it works.
* if I set the wrong credentials on the remote, it does not authenticate correctly.

I'm not sure I understood your question 100%. Did I maybe troubleshoot the wrong scenario?

Revision history for this message
Johan Mynhardt (johanmynhardt) wrote :

Looks good to me! Although it appears that in several places the indents have been replaced with spaces. I'm not 100% sure of the convention, but most places I looked, it seems that the indents are achieved by means of tabs.

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote :

No you were right.
I changed the userid and forgot to press "Activate" to enable it.
Retested and works fine.

The code layout has always been an issue as we use different editors. I use plain intelij now and it looks fine!

Revision history for this message
Johan Mynhardt (johanmynhardt) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

My guess is that somewhere tabs are used and somewhere spaces are used. Can you try to decide which you want to use, and then set the entire code base to use those?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches