openlp/android
1
0
Fork 0
mirror of https://gitlab.com/openlp/android.git synced 2024-12-22 20:02:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix update refresh after action

Browse Source
This commit is contained in:
Tim Bentley 2015-04-02 21:52:53 +01:00
parent 9c073c42ec
commit 25272f72f7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
View File

@ -46,6 +46,8 @@ import org.openlp.android2.common.OpenLPHttpClient;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
public class LiveListFragment extends OpenLPFragment { public class LiveListFragment extends OpenLPFragment {
@ -100,6 +102,7 @@ public class LiveListFragment extends OpenLPFragment {
aList.add(hm); aList.add(hm);
} }
} catch (JSONException e) { } catch (JSONException e) {
Log.e(LOG_TAG,json);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -141,7 +144,6 @@ public class LiveListFragment extends OpenLPFragment {
Log.i(LOG_TAG, "populate_display - exit"); Log.i(LOG_TAG, "populate_display - exit");
} }
@Override @Override
public void refreshDisplay() { public void refreshDisplay() {
Log.d(LOG_TAG, "Resuming..."); Log.d(LOG_TAG, "Resuming...");
@ -156,7 +158,7 @@ public class LiveListFragment extends OpenLPFragment {
Log.d(LOG_TAG, "Resumed..."); Log.d(LOG_TAG, "Resumed...");
} }
public void processUpdate(String response) { public void processUpdate(String response, boolean inError) {
triggerTextRequest(Api.LIVE_TEXT); triggerTextRequest(Api.LIVE_TEXT);
} }
@ -166,7 +168,6 @@ public class LiveListFragment extends OpenLPFragment {
triggerTextRequest(String.format("%s%s", Api.LIVE_SET, request)); triggerTextRequest(String.format("%s%s", Api.LIVE_SET, request));
Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), position(%s)", Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), position(%s)",
Api.LIVE_SET, position)); Api.LIVE_SET, position));
//Toast.makeText(getActivity().getBaseContext(), "Display Item selected", Toast.LENGTH_SHORT).show();
} catch (JsonHelpers.JSONHandlerException e) { } catch (JsonHelpers.JSONHandlerException e) {
e.printStackTrace(); e.printStackTrace();
Toast.makeText(getActivity().getBaseContext(), "Request Failed", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity().getBaseContext(), "Request Failed", Toast.LENGTH_SHORT).show();

2
app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java
View File

@ -113,7 +113,7 @@ public class ServiceListFragment extends OpenLPFragment {
Log.d(LOG_TAG, "Resumed..."); Log.d(LOG_TAG, "Resumed...");
} }
public void processUpdate(String response) { public void processUpdate(String response, boolean inError) {
triggerTextRequest(Api.SERVICE_LIST); triggerTextRequest(Api.SERVICE_LIST);
} }

11
app/src/main/res/values/strings.xml
View File

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="about_display_1">OpenLP is free church presentation software</string> <string name="about_display_1">OpenLP is free church presentation software</string>
<string name="about_display_2">Find out more about visit the OpenLP website_</string> <string name="about_display_2">To find out more visit the OpenLP website</string>
<string name="about_display_4">Copyright</string> <string name="about_display_4">Copyright</string>
<string name="about_display_5">Portions copyright</string> <string name="about_display_5">Portions copyright</string>
<string name="about_display_6">License</string> <string name="about_display_6">License</string>
<string name="about_display_7">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License_</string> <string name="about_display_7">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License</string>
<string name="about_display_8">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE_</string> <string name="about_display_8">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="action_about">About</string> <string name="action_about">About</string>
<string name="action_alert">Alert</string> <string name="action_alert">Alert</string>
@ -25,7 +24,7 @@
<string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string> <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string>
<string name="connection_timeout">Connection Timeout</string> <string name="connection_timeout">Connection Timeout</string>
<string name="connection_timeout_summary">Select a value (milliseconds)</string> <string name="connection_timeout_summary">Select a value (milliseconds)</string>
<string name="connection_userid">Userid</string> <string name="connection_userid">Username</string>
<string name="custom_timeout">Set Custom Timeout</string> <string name="custom_timeout">Set Custom Timeout</string>
<string name="display_blank_summary">Select the required blank type</string> <string name="display_blank_summary">Select the required blank type</string>
<string name="display_desktop">Blank display to Desktop</string> <string name="display_desktop">Blank display to Desktop</string>
@ -35,7 +34,7 @@
<string name="enable_custom_timeouts">Enable Custom Timeouts</string> <string name="enable_custom_timeouts">Enable Custom Timeouts</string>
<string name="enter_alert_text">Enter Alert Text</string> <string name="enter_alert_text">Enter Alert Text</string>
<string name="home">Home</string> <string name="home">Home</string>
<string name="httpreturn_unauthorised">Unauthorised Access, please enter valid userid and password</string> <string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string>
<string name="live_list">Live List</string> <string name="live_list">Live List</string>
<string name="live_view">LiveView</string> <string name="live_view">LiveView</string>
<string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_open">Open navigation drawer</string>