Skip to content

Update QueueIT SDK & AndroidX #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malua wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update QueueIT SDK & AndroidX #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49e4c54
Use androidx library of Android SDK
malua Oct 2, 2024
1076204
Update plugin.xml
malua Oct 3, 2024
4ce2307
fix: update android plugin to work with latest android sdk
malua Nov 5, 2024
69da33c
fix: set isTest on ApiClient
malua Nov 5, 2024
545204b
fix: add missing import for QueueDisabledInfo
malua Nov 5, 2024
199d959
fix: replace QueueItService with QueueITApiClient to set testing
malua Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<param name="android-package" value="com.queueit.QueueIt"/>
</feature>
</config-file>
<framework src="com.queue-it.androidsdk:library:2.0.34"/>
<framework src="com.queue-it.androidsdk:library-androidx:2.1.7"/>
<source-file src="src/android/QueueIt.java" target-dir="src/com/queueit" />

<edit-config file="AndroidManifest.xml"
Expand All @@ -41,7 +41,7 @@
<source url="https://github.com/CocoaPods/Specs.git"/>
</config>
<pods use-frameworks="true">
<pod name="QueueITLibrary" spec="3.0.14" />
<pod name="QueueITLibrary" spec="3.4.3" />
</pods>
</podspec>
<header-file src="src/ios/CPQueueIt.h" />
Expand Down
9 changes: 5 additions & 4 deletions src/android/QueueIt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
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;
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;
Expand Down Expand Up @@ -57,7 +58,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;
}

Expand Down Expand Up @@ -87,7 +88,7 @@ protected void onQueueViewWillOpen() {
}

@Override
protected void onQueueDisabled() {
protected void onQueueDisabled(QueueDisabledInfo queueDisabledInfo) {
callbackContext.sendPluginResult(getRunResultObject(null, EnqueueResultState.Disabled));
}

Expand All @@ -109,7 +110,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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/ios/CPQueueIt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import <Cordova/CDV.h>

#import <QueueITLibrary/QueueITEngine.h>
#import <QUeueITLibrary/QueueService.h>
#import <QUeueITLibrary/QueueITApiClient.h>

#define ENQUEUE_STATE(x) \
(EnqueueState_toString[x])
Expand Down
2 changes: 1 addition & 1 deletion src/ios/CPQueueIt.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down