diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java index d285ae0..04d09e8 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -46,6 +46,8 @@ import org.openlp.android2.common.OpenLPHttpClient; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Timer; +import java.util.TimerTask; public class LiveListFragment extends OpenLPFragment { @@ -100,6 +102,7 @@ public class LiveListFragment extends OpenLPFragment { aList.add(hm); } } catch (JSONException e) { + Log.e(LOG_TAG,json); e.printStackTrace(); } } @@ -141,7 +144,6 @@ public class LiveListFragment extends OpenLPFragment { Log.i(LOG_TAG, "populate_display - exit"); } - @Override public void refreshDisplay() { Log.d(LOG_TAG, "Resuming..."); @@ -156,7 +158,7 @@ public class LiveListFragment extends OpenLPFragment { Log.d(LOG_TAG, "Resumed..."); } - public void processUpdate(String response) { + public void processUpdate(String response, boolean inError) { triggerTextRequest(Api.LIVE_TEXT); } @@ -166,7 +168,6 @@ public class LiveListFragment extends OpenLPFragment { triggerTextRequest(String.format("%s%s", Api.LIVE_SET, request)); Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), position(%s)", Api.LIVE_SET, position)); - //Toast.makeText(getActivity().getBaseContext(), "Display Item selected", Toast.LENGTH_SHORT).show(); } catch (JsonHelpers.JSONHandlerException e) { e.printStackTrace(); Toast.makeText(getActivity().getBaseContext(), "Request Failed", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java index 227d256..279e357 100644 --- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java @@ -113,7 +113,7 @@ public class ServiceListFragment extends OpenLPFragment { Log.d(LOG_TAG, "Resumed..."); } - public void processUpdate(String response) { + public void processUpdate(String response, boolean inError) { triggerTextRequest(Api.SERVICE_LIST); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fb8e05e..d26c2e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,13 +1,12 @@ - OpenLP is free church presentation software - Find out more about visit the OpenLP website_ + To find out more visit the OpenLP website Copyright Portions copyright License - 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_ - 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_ + 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 + 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 Settings About Alert @@ -25,7 +24,7 @@ Specify whether HTTPS should be used Connection Timeout Select a value (milliseconds) - Userid + Username Set Custom Timeout Select the required blank type Blank display to Desktop @@ -35,7 +34,7 @@ Enable Custom Timeouts Enter Alert Text Home - Unauthorised Access, please enter valid userid and password + Unauthorised Access, please enter valid username and password Live List LiveView Open navigation drawer