From 18811371a7df8f9942d15d6a9c4bf94cada45bde Mon Sep 17 00:00:00 2001 From: Synced Synapse Date: Tue, 15 Nov 2016 19:25:16 +0000 Subject: [PATCH] Use Kodi's version stored on the DB to decide which window to display on long press on Info button --- .../java/org/xbmc/kore/ui/RemoteFragment.java | 34 ++++++------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java b/app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java index b661598..bbf7be7 100644 --- a/app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/RemoteFragment.java @@ -203,30 +203,16 @@ public class RemoteFragment extends Fragment setupDefaultButton(contextButton, new Input.ExecuteAction(Input.ExecuteAction.CONTEXTMENU), null); // Info button, v17 uses a different window to display codec info so check version number - Application.GetProperties getProperties = new Application.GetProperties(Application.GetProperties.VERSION); - getProperties.execute(hostManager.getConnection(), new ApiCallback() { - @Override - public void onSuccess(ApplicationType.PropertyValue result) { - if (!isAdded()) return; - if (result.version.major < 17) { - setupDefaultButton(infoButton, - new Input.ExecuteAction(Input.ExecuteAction.INFO), - new Input.ExecuteAction(Input.ExecuteAction.CODECINFO)); - } else { - setupDefaultButton(infoButton, - new Input.ExecuteAction(Input.ExecuteAction.INFO), - new Input.ExecuteAction(Input.ExecuteAction.PLAYERPROCESSINFO)); - } - } - @Override - public void onError(int errorCode, String description) { - if (!isAdded()) return; - // Something went wrong - Toast.makeText(getActivity(), - String.format(getString(R.string.error_getting_properties), description), - Toast.LENGTH_SHORT).show(); - } - }, callbackHandler); + HostInfo hostInfo = hostManager.getHostInfo(); + if (hostInfo.getKodiVersionMajor() < 17) { + setupDefaultButton(infoButton, + new Input.ExecuteAction(Input.ExecuteAction.INFO), + new Input.ExecuteAction(Input.ExecuteAction.CODECINFO)); + } else { + setupDefaultButton(infoButton, + new Input.ExecuteAction(Input.ExecuteAction.INFO), + new Input.ExecuteAction(Input.ExecuteAction.PLAYERPROCESSINFO)); + } adjustRemoteButtons();