diff --git a/plugin.xml b/plugin.xml index d408e4d..7d8dd78 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + EMS Launcher Provider Plugin Companion Cordova plugin for the EMS Launcher Provider SDK MIT diff --git a/src/android/com/bluefletch/ems/LauncherProviderPlugin.java b/src/android/com/bluefletch/ems/LauncherProviderPlugin.java index 77250ae..7e795d2 100644 --- a/src/android/com/bluefletch/ems/LauncherProviderPlugin.java +++ b/src/android/com/bluefletch/ems/LauncherProviderPlugin.java @@ -18,12 +18,24 @@ public boolean execute(final String action, final JSONArray args, final Callback Context context = cordova.getActivity().getApplicationContext(); if (action.equals("getCurrentSessionAsJson")) { - - String currentSession = LauncherProviderHelper.getCurrentSessionAsJson(context); - JSONObject sessionObject = new JSONObject(currentSession); - PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, sessionObject); - pluginResult.setKeepCallback(true); - callbackContext.sendPluginResult(pluginResult); + cordova.getThreadPool().execute(new Runnable() { + @Override + public void run() { + String currentSession = LauncherProviderHelper.getCurrentSessionAsJson(context); + if(currentSession == null || currentSession.isEmpty()){ + currentSession = "{\"groups\":\"*\"}"; + } + JSONObject sessionObject = null; + try { + sessionObject = new JSONObject(currentSession); + } catch (JSONException e) { + e.printStackTrace(); + } +// PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, sessionObject); +// pluginResult.setKeepCallback(false); + callbackContext.success(sessionObject); + } + }); } else if (action.equals("addConfigExtAttribute")) { LauncherProviderHelper.addConfigExtAttribute(context, args.getString(0), args.getString(1)); diff --git a/src/android/launcherProvider.gradle b/src/android/launcherProvider.gradle index 679e23a..b29a0bc 100644 --- a/src/android/launcherProvider.gradle +++ b/src/android/launcherProvider.gradle @@ -7,6 +7,7 @@ repositories{ dependencies { implementation(name:'launcherProvider-3.4.7', ext:'aar') + implementation 'com.jakewharton.timber:timber:5.0.1' } android {