Preparing release 2.1.8

Author: queue-it

README.md

@@ -157,4 +157,4 @@ If your application is using an API that's protected by a Queue-it connector (Kn
 
 ```xml
 <activity android:name="com.queue_it.androidsdk.QueueActivity" />
-```
+```

build.gradle

@@ -11,11 +11,10 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0"
-        classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.4.0"
+        classpath 'io.github.gradle-nexus:publish-plugin:2.0.0'
     }
 }
-apply plugin: 'io.codearte.nexus-staging'
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
 
 Properties localProps = new Properties()
 if (rootProject.file("local.properties").exists()) {
@@ -36,7 +35,7 @@ allprojects {
         groupId = 'com.queue-it.androidsdk'
         libraryName = 'com.queue_it.androidsdk'
         libraryDescription = 'Android SDK to integrate with Queue-it'
-        libraryVersion = "2.1.7"
+        libraryVersion = "2.1.8"
         organization = "Queue-it"
         organizationUrl = "https://queue-it.com"
 
@@ -50,13 +49,29 @@ allprojects {
         var = '7.0.0-alpha05'
         extraProperties = localProps
 
-        OSSRH_USERNAME = localProps.getProperty("OSSRH_USERNAME") ?: System.getenv("OSSRH_USERNAME")
-        OSSRH_PASSWORD = localProps.getProperty("OSSRH_PASSWORD") ?: System.getenv("OSSRH_PASSWORD")
+        SONATYPE_USERNAME = localProps.getProperty("SONATYPE_USERNAME") ?: System.getenv("SONATYPE_USERNAME")
+        SONATYPE_PASSWORD = localProps.getProperty("SONATYPE_PASSWORD") ?: System.getenv("SONATYPE_PASSWORD")
         PGP_KEY = localProps.getProperty("PGP_KEY") ?: System.getenv("PGP_KEY")
         PGP_PASSWORD = localProps.getProperty("PGP_PASSWORD") ?: System.getenv("PGP_PASSWORD")
     }
 }
 
+nexusPublishing {
+    packageGroup = groupId
+    
+    repositories {    
+        sonatype {
+            //stagingProfileId = "219f8fe296e7e"
+            
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+            
+            username.set(SONATYPE_USERNAME)
+            password.set(SONATYPE_PASSWORD)
+        }
+    }
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

documentation/App + Connector integration with QueueITToken.png

@@ -22,3 +22,4 @@ The integration can be described in the following steps:
 4. Scenario 2, user should not be queued  
 4.1. We store the Queue-it cookies from the response
 
+![API Integration Flow](https://github.com/queueit/android-webui-sdk/blob/master/documentation/App%20+%20Connector%20integration%20with%20QueueITToken.png "App Integration Flow")

documentation/protected_apis.md

@@ -76,11 +76,4 @@ artifacts {
     archives sourcesJar
 }
 
-nexusStaging {
-    stagingProfileId = "219f8fe296e7e"
-    packageGroup = groupId
-    username = OSSRH_USERNAME
-    password = OSSRH_PASSWORD
-}
-
 apply from: '../publish.gradle' // Makes this library publishable

library/build.gradle

@@ -121,6 +121,14 @@ public void initialize(Bundle savedInstanceState) {
         _context.setContentView(R.layout.activity_queue);
         readActivityExtras(savedInstanceState);
         cleanupWebView();
+
+        if (queueUrl == null || targetUrl == null) {
+            broadcaster.broadcastQueueError("Failed to load the queue. Queue Url or Target Url are missing from the running Activity. " +
+                    "Please, check the error logs for more details.");
+            _context.finish();
+            return;
+        }
+
         final ProgressBar progressBar = _context.findViewById(R.id.progressBar);
 
         FrameLayout layout = _context.findViewById(R.id.relativeLayout);
@@ -152,6 +160,12 @@ public void saveInstanceState(Bundle outState) {
         outState.putString("targetUrl", targetUrl);
         outState.putString("webViewUserAgent", webViewUserAgent);
         outState.putString("userId", uriOverrider.getUserId());
+
+        Log.i("QueueITEngine", "Saving instance state:");
+        Log.i("QueueITEngine", "queueUrl: " + queueUrl);
+        Log.i("QueueITEngine", "targetUrl: " + targetUrl);
+        Log.i("QueueITEngine", "webViewUserAgent: " + webViewUserAgent);
+        Log.i("QueueITEngine", "userId: " + uriOverrider.getUserId());
     }
 
     public void destroy() {
@@ -181,8 +195,17 @@ private void readActivityExtras(Bundle savedInstanceState) {
             uriOverrider.setUserId((String) savedInstanceState.getSerializable("userId"));
         }
 
-        uriOverrider.setTarget(Uri.parse(targetUrl));
-        uriOverrider.setQueue(Uri.parse(queueUrl));
+        if (targetUrl != null) {
+            uriOverrider.setTarget(Uri.parse(targetUrl));
+        } else {
+            Log.e("QueueITEngine", "targetUrl is null, cannot set target Uri");
+        }
+
+        if (queueUrl != null) {
+            uriOverrider.setQueue(Uri.parse(queueUrl));
+        } else {
+            Log.e("QueueITEngine", "queueUrl is null, cannot set queue Uri");
+        }
     }
 
     private void disposeWebview(WebView webView) {

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

@@ -1,6 +1,5 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
-apply plugin: "de.marcphilipp.nexus-publish"
 
 group = groupId
 version = libraryVersion
@@ -98,13 +97,4 @@ signing {
     publishing.publications.all { publication ->
         sign(publication)
     }
-}
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            username.set(OSSRH_USERNAME)
-            password.set(OSSRH_PASSWORD)
-        }
-    }
 }