Merge pull request #15 from sp0x/master

Allows the handling of the user exiting the line.

.github/workflows/bintray-publish.yml

@@ -0,0 +1,34 @@
+name: Publish to bintray on closed PR
+on:
+  # Trigger the workflow on push to master branch
+  push:
+    branches: [master]
+
+jobs:
+  gradle:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Check Commit Type
+      uses: gsactions/commit-message-checker@v1
+      #Commit should be like "^Merge pull request #"
+      with:
+        pattern: '^Merge pull request #\d'
+        flags: 'gm'
+        error: 'This action runs only on PR merges. Check your commit message.'
+    - uses: actions/checkout@v2
+    # Export properties
+    - name: Setup bintray credentials
+      env:
+        BINTRAY_APIKEY: ${{ secrets.BINTRAY_APIKEY }}
+      run: |
+        echo "bintray.user=queueitdevs" > ./local.properties
+        echo "bintray.apiKey=${BINTRAY_APIKEY}" >> ./local.properties
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - uses: eskatos/gradle-command-action@v1
+      with:
+        arguments: bintrayUpload

.github/workflows/gradle-build.yml

@@ -0,0 +1,18 @@
+name: Run Gradle Build on Push
+on: push
+jobs:
+  gradle:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Create local.properties
+      run: echo "" >> ./local.properties
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - uses: eskatos/gradle-command-action@v1
+      with:
+        arguments: build

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "files.exclude": {
+        "**/.classpath": true,
+        "**/.project": true,
+        "**/.settings": true,
+        "**/.factorypath": true
+    }
+}

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

demoapp/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 26
     buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.queue_it.shopdemo"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -20,9 +20,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile project(':library')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
+    implementation project(':library')
 }

demoapp/src/main/java/com/queue_it/shopdemo/MainActivity.java

@@ -89,6 +89,11 @@ public void onQueueViewWillOpen() {
                         queue_button.setEnabled(true);
                     }
 
+                    @Override
+                    public void onUserExited() {
+                        Toast.makeText(getApplicationContext(), "onUserExited", Toast.LENGTH_SHORT).show();
+                    }
+
                     @Override
                     public void onQueueDisabled() {
                         showResultActivity("The queue is disabled.", false);
@@ -106,6 +111,7 @@ public void onError(Error error, String errorMessage) {
                         showResultActivity("Critical error: " + errorMessage, false);
                         queue_button.setEnabled(true);
                     }
+
                 });
                 try {
                     queueITEngine.run(MainActivity.this, !enableCacheRadioButton.isChecked());

library/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 def org = "queueit"
 android {
-    compileSdkVersion 23
+    compileSdkVersion 26
     buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode 1
         versionName "2.0.22"
     }
@@ -22,7 +22,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.squareup.okhttp3:okhttp:3.3.1'
 }
 
@@ -108,7 +108,7 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(
 
 bintray {
     user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
+    key = properties.getProperty("bintray.apiKey")
 
     configurations = ['archives']
     pkg {

library/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.queue_it.androidsdk">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
         android:allowBackup="true"
         android:label="@string/app_name"

library/src/main/java/com/queue_it/androidsdk/QueueActivity.java

@@ -88,6 +88,9 @@ public boolean shouldOverrideUrlLoading(WebView view, String urlString) {
                     urlString = QueueUrlHelper.updateUrl(urlString, userId);
                     Log.v("QueueITEngine", "URL intercepting: " + urlString);
                 }
+                if(isExitLineUrl(urlString)){
+                    broadcastUserExited();
+                }
                 broadcastChangedQueueUrl(urlString);
                 if(needsRewrite){
                     webview.loadUrl(urlString);
@@ -111,6 +114,17 @@ public boolean shouldOverrideUrlLoading(WebView view, String urlString) {
         }
     };
 
+    private boolean isExitLineUrl(String urlString) {
+        URL url = null;
+        try {
+            url = new URL(urlString);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return url.getPath().equals("/exitline.aspx");
+    }
+
     private static void cleanupWebView(){
         if(previousWebView==null) return;
         previousWebView.destroy();
@@ -206,6 +220,11 @@ private void broadcastQueueActivityClosed() {
         LocalBroadcastManager.getInstance(QueueActivity.this).sendBroadcast(intent);
     }
 
+    public void broadcastUserExited(){
+        Intent intent = new Intent("queue-user-exited");
+        LocalBroadcastManager.getInstance(QueueActivity.this).sendBroadcast(intent);
+    }
+
     private void broadcastQueueError(String errorMessage) {
         Intent intent = new Intent("on-queue-error");
         intent.putExtra("error-message", errorMessage);

library/src/main/java/com/queue_it/androidsdk/QueueITEngine.java

@@ -128,6 +128,7 @@ private void registerReceivers() {
         localBroadcastManager.registerReceiver(_queuePassedBroadcastReceiver, new IntentFilter("on-queue-passed"));
         localBroadcastManager.registerReceiver(_queueUrlChangedBroadcastReceiver, new IntentFilter("on-changed-queue-url"));
         localBroadcastManager.registerReceiver(_queueActivityClosedBroadcastReceiver, new IntentFilter("queue-activity-closed"));
+        localBroadcastManager.registerReceiver(_queueUserExitedBroadcastReceiver, new IntentFilter("queue-user-exited"));
         localBroadcastManager.registerReceiver(_queueErrorBroadcastReceiver, new IntentFilter("on-queue-error"));
     }
 
@@ -137,6 +138,7 @@ private void unregisterReceivers() {
         localBroadcastManager.unregisterReceiver(_queuePassedBroadcastReceiver);
         localBroadcastManager.unregisterReceiver(_queueUrlChangedBroadcastReceiver);
         localBroadcastManager.unregisterReceiver(_queueActivityClosedBroadcastReceiver);
+        localBroadcastManager.unregisterReceiver(_queueUserExitedBroadcastReceiver);
         localBroadcastManager.unregisterReceiver(_queueErrorBroadcastReceiver);
     }
 
@@ -162,6 +164,13 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
+    private BroadcastReceiver _queueUserExitedBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            raiseUserExited();
+        }
+    };
+
     private BroadcastReceiver _queueActivityClosedBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -214,6 +223,10 @@ private void raiseQueueViewWillOpen() {
         _isInQueue = true;
     }
 
+    private void raiseUserExited(){
+        _queueListener.onUserExited();
+    }
+
     private void raiseQueuePassed(String queueItToken) {
         _queueCache.clear();
         _queueListener.onQueuePassed(new QueuePassedInfo(queueItToken));

library/src/main/java/com/queue_it/androidsdk/QueueListener.java

@@ -7,4 +7,5 @@ public interface QueueListener {
     void onQueueDisabled();
     void onQueueItUnavailable();
     void onError(Error error, String errorMessage);
+    void onUserExited();
 }