Skip to content

Commit 629a368

Browse files
committed
Bugfix cookie issues.
1 parent 6b866ee commit 629a368

2 files changed

Lines changed: 8 additions & 28 deletions

File tree

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.os.Bundle;
1010
import android.util.Log;
1111
import android.view.View;
12+
import android.webkit.CookieSyncManager;
1213
import android.webkit.SslErrorHandler;
1314
import android.webkit.WebChromeClient;
1415
import android.webkit.WebResourceError;
@@ -34,6 +35,12 @@ public class QueueActivity extends AppCompatActivity {
3435

3536
WebViewClient webviewClient = new WebViewClient() {
3637

38+
@Override
39+
public void onPageFinished(WebView view, String url) {
40+
super.onPageFinished(view, url);
41+
CookieSyncManager.getInstance().sync();
42+
}
43+
3744
@Override
3845
public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
3946
String errorMessage;
@@ -81,9 +88,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String urlString) {
8188
urlString = QueueUrlHelper.updateUrl(urlString, userId);
8289
Log.v("QueueITEngine", "URL intercepting: " + urlString);
8390
}
84-
if(isLeaveRequest(urlString)){
85-
broadcastQueueLeft();
86-
}
91+
broadcastChangedQueueUrl(urlString);
8792
if(needsRewrite){
8893
webview.loadUrl(urlString);
8994
return true;
@@ -106,17 +111,6 @@ public boolean shouldOverrideUrlLoading(WebView view, String urlString) {
106111
}
107112
};
108113

109-
private boolean isLeaveRequest(String urlString) {
110-
URL url = null;
111-
try {
112-
url = new URL(urlString);
113-
} catch (MalformedURLException e) {
114-
e.printStackTrace();
115-
return false;
116-
}
117-
return url.getPath().equals("/exitline.aspx");
118-
}
119-
120114
private static void cleanupWebView(){
121115
if(previousWebView==null) return;
122116
previousWebView.destroy();
@@ -207,11 +201,6 @@ private void broadcastQueuePassed(String queueItToken) {
207201
LocalBroadcastManager.getInstance(QueueActivity.this).sendBroadcast(intent);
208202
}
209203

210-
private void broadcastQueueLeft(){
211-
Intent intent = new Intent("on-queue-left");
212-
LocalBroadcastManager.getInstance(QueueActivity.this).sendBroadcast(intent);
213-
}
214-
215204
private void broadcastQueueActivityClosed() {
216205
Intent intent = new Intent("queue-activity-closed");
217206
LocalBroadcastManager.getInstance(QueueActivity.this).sendBroadcast(intent);

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ private void registerReceivers() {
129129
localBroadcastManager.registerReceiver(_queueUrlChangedBroadcastReceiver, new IntentFilter("on-changed-queue-url"));
130130
localBroadcastManager.registerReceiver(_queueActivityClosedBroadcastReceiver, new IntentFilter("queue-activity-closed"));
131131
localBroadcastManager.registerReceiver(_queueErrorBroadcastReceiver, new IntentFilter("on-queue-error"));
132-
localBroadcastManager.registerReceiver(_queueLeftBroadcastReceiver, new IntentFilter("on-queue-left"));
133132
}
134133

135134
private void unregisterReceivers() {
@@ -139,7 +138,6 @@ private void unregisterReceivers() {
139138
localBroadcastManager.unregisterReceiver(_queueUrlChangedBroadcastReceiver);
140139
localBroadcastManager.unregisterReceiver(_queueActivityClosedBroadcastReceiver);
141140
localBroadcastManager.unregisterReceiver(_queueErrorBroadcastReceiver);
142-
localBroadcastManager.unregisterReceiver(_queueLeftBroadcastReceiver);
143141
}
144142

145143
private BroadcastReceiver _queuePassedBroadcastReceiver = new BroadcastReceiver() {
@@ -156,13 +154,6 @@ public void onReceive(Context context, Intent intent) {
156154
}
157155
};
158156

159-
private BroadcastReceiver _queueLeftBroadcastReceiver = new BroadcastReceiver() {
160-
@Override
161-
public void onReceive(Context context, Intent intent) {
162-
_queueCache.clear();
163-
}
164-
};
165-
166157
private BroadcastReceiver _queueUrlChangedBroadcastReceiver = new BroadcastReceiver() {
167158
@Override
168159
public void onReceive(Context context, Intent intent) {

0 commit comments

Comments
 (0)