infobip
diff --git a/‎infobip-mobile-messaging-android-chat-sdk/src/main/assets/livechat-widget.html
+67-12 b/‎infobip-mobile-messaging-android-chat-sdk/src/main/assets/livechat-widget.html
+67-12
diff --git a/‎infobip-mobile-messaging-android-chat-sdk/src/main/java/org/infobip/mobile/messaging/chat/InAppChatImpl.java
+1-1 b/‎infobip-mobile-messaging-android-chat-sdk/src/main/java/org/infobip/mobile/messaging/chat/InAppChatImpl.java
+1-1
diff --git a/‎infobip-mobile-messaging-android-chat-sdk/src/main/java/org/infobip/mobile/messaging/chat/core/widget/LivechatWidgetApi.kt
+22-98 b/‎infobip-mobile-messaging-android-chat-sdk/src/main/java/org/infobip/mobile/messaging/chat/core/widget/LivechatWidgetApi.kt
+22-98
@@ -25,6 +25,7 @@
         const widgetTheme = getQueryParameter('widgetTheme');
 
         let uri = 'https://livechat.infobip.com/widget.js';
+        let livechatSdk = null;
 
         let decodedWidgetUri = null;
         if (!isNullOrBlank(widgetUri)) {
@@ -77,16 +78,17 @@
 
         // If all is OK -> initialize widget, enable native controls and show widget
         function init() {
-            let initParams = null;
-            if (domain != null) {
-                initParams = { widgetId: widgetId, domain: domain };
-            }
-            liveChat('init', initParams, function (error, result) {
+            const callback = function (error, result) {
                 widgetApiCallback('initWidget', error, result);
-                if(!error) {
-                   show();
+                if (!error) {
+                    show();
                 }
-            });
+            };
+            if (domain != null) {
+                liveChat('init', { widgetId: widgetId, domain: domain }, callback);
+            } else {
+                liveChat('init', widgetId, callback);
+            }
         }
 
         function show() {
@@ -106,10 +108,13 @@
         });
 
         function addLiveChatEventsListener() {
-            const liveChatSDK = new LiveChatSDK();
-            liveChatSDK.on('messageReceived', (payload) => {
-                InAppChatMobile.onRawMessageReceived(stringify(payload));
-            });
+            try {
+                getLivechatSdk().on('messageReceived', (payload) => {
+                    InAppChatMobile.onRawMessageReceived(stringify(payload));
+                });
+            } catch (e) {
+                console.error('Could not register to observe messageReceived event: ', e);
+            }
         }
 
         //Widget API
@@ -164,6 +169,45 @@
             liveChat('set_theme', theme, (error, result) => widgetApiCallback('setTheme', error, result));
         }
 
+        async function getThreads() {
+            try {
+                const response = await getLivechatSdk().getThreads();
+                if (response.success) {
+                    widgetApiCallback('getThreads', null, response.data);
+                } else {
+                    widgetApiCallback('getThreads', response.error, null);
+                }
+            } catch (e) {
+                widgetApiCallback('getThreads', `Could not get threads ${e.message}`, null);
+            }
+        }
+
+        async function showThread(threadId) {
+            try {
+                const response = await getLivechatSdk().getWidget().showThread(threadId);
+                if (response.success) {
+                    widgetApiCallback('showThread', null, response.data);
+                } else {
+                    widgetApiCallback('showThread', response.error, null);
+                }
+            } catch (e) {
+                widgetApiCallback('showThread', `Could not show thread ${e.message}`, null);
+            }
+        }
+
+        async function getActiveThread() {
+            try {
+                const response = await getLivechatSdk().getActiveThread();
+                if (response.success) {
+                    widgetApiCallback('getActiveThread', null, response.data);
+                } else {
+                    widgetApiCallback('getActiveThread', response.error, null);
+                }
+            } catch (e) {
+                widgetApiCallback('getActiveThread', `Could not show thread ${e.message}`, null);
+            }
+        }
+
         function getQueryParameter(name) {
             if (name = (new RegExp('[?&]' + encodeURIComponent(name) + '=([^&]*)')).exec(location.search)) {
                 return decodeURIComponent(name[1]);
@@ -197,6 +241,17 @@
             }
         }
 
+        function getLivechatSdk() {
+            if (!livechatSdk) {
+                try {
+                    livechatSdk = new LiveChatSDK();
+                } catch (e) {
+                    throw e;
+                }
+            }
+            return livechatSdk;
+        }
+
     </script>
 </body>
 
 
@@ -189,7 +189,7 @@ public void applicationInForeground() {
     // must be done on separate thread if it's not invoked by UI thread
     private void cleanupWidgetData() {
         sessionStorage().setConfigSyncResult(null);
-        livechatWidgetApi().reset();
+        getLivechatWidgetApi().reset();
     }
 
     @Override
 
@@ -3,19 +3,12 @@ package org.infobip.mobile.messaging.chat.core.widget
 import org.infobip.mobile.messaging.chat.attachments.InAppChatMobileAttachment
 import org.infobip.mobile.messaging.chat.core.JwtProvider
 import org.infobip.mobile.messaging.chat.core.MultithreadStrategy
-import org.infobip.mobile.messaging.chat.core.widget.LivechatWidgetApi.ExecutionListener
 
 /**
  * The `LivechatWidgetApi` interface provides methods to interact with the Livechat widget.
  * It allows you to perform various actions such as sending messages, setting themes, and managing the widget's state.
  * It creates queue for widget functions execution using Kotlin Mutex, single function is executed at a time.
  *
- * ### Important Note on `ExecutionListener`
- *
- * The [ExecutionListener] used in the `LivechatWidgetApi` methods does not return the actual return value from the Livechat widget.
- * Instead, it provides a way to listen for the completion of the execution of a method.
- * If you need to get the real return value from the Livechat widget, you should use the [LivechatWidgetEventsListener].
- *
  * ### Using `LivechatWidgetEventsListener`
  * To get the real return value from the Livechat widget, you should use the [LivechatWidgetEventsListener].
  * This listener provides events that you can handle to get the actual data from the widget.
@@ -104,23 +97,8 @@ interface LivechatWidgetApi {
      * Use [resumeConnection] to reestablish connection.
      *
      * To detect if the connection is paused use [LivechatWidgetEventsListener.onConnectionPaused] event.
-     *
-     * @param listener listen for the completion of the livechat widget method execution
      */
-    fun pauseConnection(listener: ExecutionListener<String>? = null)
-
-    /**
-     * Pauses livechat widget connection, but widget stay loaded in WebView.
-     * Widget connection and loaded state are independent.
-     *
-     * By the connection you can control push notifications.
-     * Push notifications are active only when the connection is not active.
-     *
-     * Use [resumeConnection] to reestablish connection.
-     *
-     * To detect if the connection is paused use [LivechatWidgetEventsListener.onConnectionPaused] event.
-     */
-    fun pauseConnection() = pauseConnection(listener = null)
+    fun pauseConnection()
 
     /**
      * Resumes livechat widget connection when you previously called [pauseConnection].
@@ -131,22 +109,8 @@ interface LivechatWidgetApi {
      * Use [pauseConnection] to pause connection.
      *
      * To detect if the connection is resumed use [LivechatWidgetEventsListener.onConnectionResumed] event.
-     *
-     * @param listener listen for the completion of the livechat widget method execution
      */
-    fun resumeConnection(listener: ExecutionListener<String>? = null)
-
-    /**
-     * Resumes livechat widget connection when you previously called [pauseConnection].
-     *
-     * By the connection you can control push notifications.
-     * Push notifications are active only when the connection is not active.
-     *
-     * Use [pauseConnection] to pause connection.
-     *
-     * To detect if the connection is resumed use [LivechatWidgetEventsListener.onConnectionResumed] event.
-     */
-    fun resumeConnection() = resumeConnection(listener = null)
+    fun resumeConnection()
 
     /**
      * Sends a message with optional [InAppChatMobileAttachment].
@@ -155,19 +119,8 @@ interface LivechatWidgetApi {
      *
      * @param message message to be send, max length allowed is 4096 characters
      * @param attachment to create attachment use [InAppChatMobileAttachment]'s constructor where you provide attachment's mimeType, base64 and filename
-     * @param listener listen for the completion of the livechat widget method execution
-     */
-    fun sendMessage(message: String?, attachment: InAppChatMobileAttachment? = null, listener: ExecutionListener<String>? = null)
-
-    /**
-     * Sends a message.
-     *
-     * You can observe result by [LivechatWidgetEventsListener.onMessageSent] event.
-     *
-     * @param message message to be send, max length allowed is 4096 characters
-     * @param listener listen for the completion of the livechat widget method execution
      */
-    fun sendMessage(message: String?, listener: ExecutionListener<String>? = null) = sendMessage(message = message, attachment = null, listener = listener)
+    fun sendMessage(message: String?, attachment: InAppChatMobileAttachment? = null)
 
     /**
      * Sends a message
@@ -176,17 +129,7 @@ interface LivechatWidgetApi {
      *
      * @param message message to be send, max length allowed is 4096 characters
      */
-    fun sendMessage(message: String?) = sendMessage(message = message, attachment = null, listener = null)
-
-    /**
-     * Sends a draft message.
-     *
-     * You can observe result by [LivechatWidgetEventsListener.onDraftSent] event.
-     *
-     * @param draft draft message to be send
-     * @param listener listen for the completion of the livechat widget method execution
-     */
-    fun sendDraft(draft: String, listener: ExecutionListener<String>? = null)
+    fun sendMessage(message: String) = sendMessage(message = message, attachment = null)
 
     /**
      * Sends a draft message.
@@ -195,7 +138,7 @@ interface LivechatWidgetApi {
      *
      * @param draft draft message to be send
      */
-    fun sendDraft(draft: String) = sendDraft(draft = draft, listener = null)
+    fun sendDraft(draft: String)
 
     /**
      * Sends contextual data.
@@ -204,44 +147,38 @@ interface LivechatWidgetApi {
      *
      * @param data contextual data in JSON format
      * @param multiThreadFlag multithread strategy flag
-     * @param listener listen for the completion of the livechat widget method execution
      */
-    fun sendContextualData(data: String, multiThreadFlag: MultithreadStrategy, listener: ExecutionListener<String>? = null)
+    fun sendContextualData(data: String, multiThreadFlag: MultithreadStrategy)
 
     /**
-     * Sends contextual data.
-     *
-     * You can observe result by [LivechatWidgetEventsListener.onContextualDataSent] event.
+     * Requests current threads from livechat widget.
      *
-     * @param data contextual data in JSON format
-     * @param multiThreadFlag multithread strategy flag
+     * You can observe result by [LivechatWidgetEventsListener.onThreadsReceived] event.
      */
-    fun sendContextualData(data: String, multiThreadFlag: MultithreadStrategy) = sendContextualData(data = data, multiThreadFlag = multiThreadFlag, listener = null)
+    fun getThreads()
 
     /**
-     * Navigates livechat widget from [LivechatWidgetView.THREAD] back to [LivechatWidgetView.THREAD_LIST] destination in multithread widget. It does nothing if widget is not multithread.
+     * Requests shown thread - active from livechat widget.
      *
-     * You can observe result by [LivechatWidgetEventsListener.onWidgetViewChanged] event.
-     * @param listener listen for the completion of the livechat widget method execution
+     * You can observe result by [LivechatWidgetEventsListener.onActiveThreadReceived] event.
      */
-    fun showThreadList(listener: ExecutionListener<String>? = null)
+    fun getActiveThread()
 
     /**
-     * Navigates livechat widget from [LivechatWidgetView.THREAD] back to [LivechatWidgetView.THREAD_LIST] destination in multithread widget. It does nothing if widget is not multithread.
+     * Navigates livechat widget to thread specified by provided [threadId].
+     *
+     * You can observe result by [LivechatWidgetEventsListener.onThreadShown] event.
      *
-     * You can observe result by [LivechatWidgetEventsListener.onWidgetViewChanged] event.
+     * @param threadId thread to be shown
      */
-    fun showThreadList() = showThreadList(listener = null)
+    fun showThread(threadId: String)
 
     /**
-     * Sets a livechat widget's language.
-     *
-     * You can observe result by [LivechatWidgetEventsListener.onLanguageChanged] event.
+     * Navigates livechat widget from [LivechatWidgetView.THREAD] back to [LivechatWidgetView.THREAD_LIST] destination in multithread widget. It does nothing if widget is not multithread.
      *
-     * @param language language to be set
-     * @param listener listen for the completion of the livechat widget method execution
+     * You can observe result by [LivechatWidgetEventsListener.onThreadListShown] or [LivechatWidgetEventsListener.onWidgetViewChanged] event.
      */
-    fun setLanguage(language: LivechatWidgetLanguage, listener: ExecutionListener<String>? = null)
+    fun showThreadList()
 
     /**
      * Sets a livechat widget's language.
@@ -250,20 +187,7 @@ interface LivechatWidgetApi {
      *
      * @param language language to be set
      */
-    fun setLanguage(language: LivechatWidgetLanguage) = setLanguage(language = language, listener = null)
-
-    /**
-     * Sets a livechat widget's theme.
-     *
-     * You can observe result by [LivechatWidgetEventsListener.onThemeChanged] event.
-     *
-     * You can define widget themes in <a href="https://portal.infobip.com/apps/livechat/widgets">Live chat widget setup page</a> in Infobip Portal, section `Advanced customization`.
-     * Please check widget <a href="https://www.infobip.com/docs/live-chat/widget-customization">documentation</a> for more details.
-     *
-     * @param themeName theme name to be set
-     * @param listener listen for the completion of the livechat widget method execution
-     */
-    fun setTheme(themeName: String, listener: ExecutionListener<String>? = null)
+    fun setLanguage(language: LivechatWidgetLanguage)
 
     /**
      * Sets a livechat widget's theme.
@@ -275,7 +199,7 @@ interface LivechatWidgetApi {
      *
      * @param themeName theme name to be set
      */
-    fun setTheme(themeName: String) = setTheme(themeName = themeName, listener = null)
+    fun setTheme(themeName: String)
 
     /**
      * Resets livechat widget state and loads blank page.
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public void applicationInForeground() {`
`189`	`189`	`// must be done on separate thread if it's not invoked by UI thread`
`190`	`190`	`private void cleanupWidgetData() {`
`191`	`191`	`sessionStorage().setConfigSyncResult(null);`
`192`		`- livechatWidgetApi().reset();`
	`192`	`+ getLivechatWidgetApi().reset();`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`@Override`