From 49e4c5499866e44f9def2256a9b2faa7193eba60 Mon Sep 17 00:00:00 2001 From: malua Date: Wed, 2 Oct 2024 10:39:49 +0200 Subject: [PATCH 1/6] Use androidx library of Android SDK --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 792316e..dc7eed3 100644 --- a/plugin.xml +++ b/plugin.xml @@ -18,7 +18,7 @@ - + Date: Thu, 3 Oct 2024 15:26:07 +0200 Subject: [PATCH 2/6] Update plugin.xml --- plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.xml b/plugin.xml index dc7eed3..d71476d 100644 --- a/plugin.xml +++ b/plugin.xml @@ -18,7 +18,7 @@ - + - + From 4ce2307ad4a6ace93309e90fa0b4204f9eb86660 Mon Sep 17 00:00:00 2001 From: Lukas Mayr Date: Tue, 5 Nov 2024 11:27:24 +0100 Subject: [PATCH 3/6] fix: update android plugin to work with latest android sdk --- src/android/QueueIt.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/QueueIt.java b/src/android/QueueIt.java index d5be9d2..1ee59d2 100644 --- a/src/android/QueueIt.java +++ b/src/android/QueueIt.java @@ -8,7 +8,7 @@ import com.queue_it.androidsdk.QueueITException; import com.queue_it.androidsdk.QueueListener; import com.queue_it.androidsdk.QueuePassedInfo; -import com.queue_it.androidsdk.QueueService; +import com.queue_it.androidsdk.QueueITApiClient; import org.apache.cordova.*; import org.json.JSONArray; @@ -87,7 +87,7 @@ protected void onQueueViewWillOpen() { } @Override - protected void onQueueDisabled() { + protected void onQueueDisabled(QueueDisabledInfo queueDisabledInfo) { callbackContext.sendPluginResult(getRunResultObject(null, EnqueueResultState.Disabled)); } @@ -109,7 +109,7 @@ protected void onWebViewClosed() { context.runOnUiThread(() -> { QueueITEngine engine = new QueueITEngine(context, customerId, eventOrAliasId, layoutName, language, listener); try { - engine.run(context, resetCache); + engine.run(context); } catch (QueueITException e) { e.printStackTrace(); } From 69da33c436648a6991651dcca298f1fd0b5bb83c Mon Sep 17 00:00:00 2001 From: Lukas Mayr Date: Tue, 5 Nov 2024 11:30:28 +0100 Subject: [PATCH 4/6] fix: set isTest on ApiClient --- src/android/QueueIt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/QueueIt.java b/src/android/QueueIt.java index 1ee59d2..033b990 100644 --- a/src/android/QueueIt.java +++ b/src/android/QueueIt.java @@ -57,7 +57,7 @@ private JSONObject getErrorObject(Error err, String errorMessage) { } private boolean enableTesting(JSONArray data) throws JSONException { - QueueService.IsTest = data.getBoolean(0); + QueueITApiClient.IsTest = data.getBoolean(0); return true; } From 545204b02bc5b8b6e282c8777c9c34a04d66e3d7 Mon Sep 17 00:00:00 2001 From: Lukas Mayr Date: Tue, 5 Nov 2024 11:34:17 +0100 Subject: [PATCH 5/6] fix: add missing import for QueueDisabledInfo --- src/android/QueueIt.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/android/QueueIt.java b/src/android/QueueIt.java index 033b990..f70765c 100644 --- a/src/android/QueueIt.java +++ b/src/android/QueueIt.java @@ -4,6 +4,7 @@ import android.os.Handler; import com.queue_it.androidsdk.Error; +import com.queue_it.androidsdk.QueueDisabledInfo; import com.queue_it.androidsdk.QueueITEngine; import com.queue_it.androidsdk.QueueITException; import com.queue_it.androidsdk.QueueListener; From 199d959fadf96cf89bdbe54939fd0fb19e8c22af Mon Sep 17 00:00:00 2001 From: Lukas Mayr Date: Wed, 6 Nov 2024 15:56:41 +0100 Subject: [PATCH 6/6] fix: replace QueueItService with QueueITApiClient to set testing --- src/ios/CPQueueIt.h | 2 +- src/ios/CPQueueIt.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ios/CPQueueIt.h b/src/ios/CPQueueIt.h index 65cf384..389e9c7 100644 --- a/src/ios/CPQueueIt.h +++ b/src/ios/CPQueueIt.h @@ -1,7 +1,7 @@ #import #import -#import +#import #define ENQUEUE_STATE(x) \ (EnqueueState_toString[x]) diff --git a/src/ios/CPQueueIt.m b/src/ios/CPQueueIt.m index 4afeb1c..62369cb 100644 --- a/src/ios/CPQueueIt.m +++ b/src/ios/CPQueueIt.m @@ -18,7 +18,7 @@ @implementation CPQueueIt - (void)enableTesting:(CDVInvokedUrlCommand*)command { BOOL value = [[command arguments] objectAtIndex:0]; - [QueueService setTesting: value]; + [QueueITApiClient setTesting: value]; } - (void)runAsync:(CDVInvokedUrlCommand*)command