diff --git a/app/app.iml b/app/app.iml
index f941dc1..b5521ed 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -90,4 +90,209 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java
index 357a65f..5a4e2f1 100644
--- a/app/src/main/java/org/openlp/android2/OpenLP.java
+++ b/app/src/main/java/org/openlp/android2/OpenLP.java
@@ -173,6 +173,15 @@ public class OpenLP extends ActionBarActivity
toggerContainer(R.id.next_button, View.GONE);
toggerContainer(R.id.prev_button, View.GONE);
break;
+ default:
+ singleTab();
+ fragmentManager.beginTransaction()
+ .replace(R.id.container, HomeFragment.newInstance())
+ .commit();
+ mTitle = getString(R.string.home);
+ toggerContainer(R.id.next_button, View.GONE);
+ toggerContainer(R.id.prev_button, View.GONE);
+ break;
}
}
diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java b/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java
index 7dd30a4..d9a889b 100644
--- a/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java
+++ b/app/src/main/java/org/openlp/android2/common/OpenLPDialog.java
@@ -46,25 +46,7 @@ abstract public class OpenLPDialog extends DialogFragment {
calledURL = url;
Log.d(LOG_TAG, "Trigger Request for url " + url);
String callurl = String.format("%s%s", httpClient.getAbsoluteUrl(client), url);
- processCall(callurl);
- }
- protected void triggerAction(String api, String plugin, String id ) {
- String request = null;
- try {
- request = JsonHelpers.createRequestJSON("text", id);
- } catch (JsonHelpers.JSONHandlerException e) {
- e.printStackTrace();
- }
- String url = String.format(api, plugin.toLowerCase());
- triggerTextRequest(String.format("%s%s", url, request));
- calledURL = url;
- Log.d(LOG_TAG, "Trigger action for url " + url);
- String callurl = String.format("%s%s", httpClient.getAbsoluteUrl(client), url);
- processCall(callurl);
- }
-
- private void processCall(String callurl){
client.get(callurl, null, new TextHttpResponseHandler() {
@Override
public void onSuccess(int statusCode, Header[] headers, String responseString) {
diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java
index e1384a4..1927cbc 100644
--- a/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java
+++ b/app/src/main/java/org/openlp/android2/common/OpenLPHttpClient.java
@@ -76,7 +76,7 @@ public class OpenLPHttpClient {
client.setSSLSocketFactory(sf);
}
catch (Exception e){
- //
+ Log.d(LOG_TAG, "Unable to support SSL");
}
}
return urlBase;
diff --git a/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java b/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
index ddf46b3..454bf6b 100644
--- a/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
+++ b/app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java
@@ -69,19 +69,21 @@ public class SearchSelectionDialog extends OpenLPDialog {
View view = inflater.inflate(R.layout.search_action_dialog, null);
builder.setView(view);
- sendLive = (RadioButton) view.findViewById(R.id.buttonService);
+ sendLive = (RadioButton) view.findViewById(R.id.buttonLive);
sendLive.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- triggerAction(Api.SEARCH_PLUGIN_LIVE, plugin, key);
+ createLive();
+ SearchSelectionDialog.this.getDialog().cancel();
}
});
- addToService = (RadioButton) view.findViewById(R.id.buttonLive);
+ addToService = (RadioButton) view.findViewById(R.id.buttonService);
addToService.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- triggerAction(Api.SEARCH_PLUGIN_ADD, plugin, key);
+ createService();
+ SearchSelectionDialog.this.getDialog().cancel();
}
});
@@ -107,15 +109,24 @@ public class SearchSelectionDialog extends OpenLPDialog {
Log.d(LOG_TAG, "Resuming...");
}
- public void processUpdate(String response) {
- Toast.makeText(context, "Alert Requested", Toast.LENGTH_SHORT).show();
+ public void createLive() {
+ try {
+ String request = JsonHelpers.createRequestJSON("id", key);
+ String url = String.format(Api.SEARCH_PLUGIN_LIVE, plugin.toLowerCase());
+ triggerTextRequest(String.format("%s%s", url, request));
+ Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_LIVE, text));
+ } catch (JsonHelpers.JSONHandlerException e) {
+ e.printStackTrace();
+ Toast.makeText(context, "Request Failed", Toast.LENGTH_SHORT).show();
+ }
}
- public void requestAlert(String text) {
+ public void createService() {
try {
- String request = JsonHelpers.createRequestJSON("text", text);
- triggerTextRequest(String.format("%s%s", Api.ALERT, request));
- Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.ALERT, text));
+ String request = JsonHelpers.createRequestJSON("id", key);
+ String url = String.format(Api.SEARCH_PLUGIN_ADD, plugin.toLowerCase());
+ triggerTextRequest(String.format("%s%s", url, request));
+ Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_ADD, text));
} catch (JsonHelpers.JSONHandlerException e) {
e.printStackTrace();
Toast.makeText(context, "Request Failed", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
index 5a262ec..fe69837 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -218,8 +218,8 @@ public class SearchFragment extends Fragment {
public void onItemClick(AdapterView parent, final View view,
int position, long id) {
final JSONArray item = (JSONArray) parent.getItemAtPosition(position);
- Toast.makeText(context, "Item Pressed " + String.valueOf(position) + item,
- Toast.LENGTH_SHORT).show();
+ //Toast.makeText(context, "Item Pressed " + String.valueOf(position) + item,
+ // Toast.LENGTH_SHORT).show();
String it = "";
try {
it = (String)item.get(1);