Handle invalid server URL (#95)

* Handle invalid server URL

* Use Assert null

Author: konraddysput

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceCredentialsTest.java

@@ -1,8 +1,11 @@
 package backtraceio.library;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import android.net.Uri;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
@@ -76,4 +79,16 @@ public void createBacktraceCredentialsWithLegacyUriAndGetSubmissionToken() {
         BacktraceCredentials backtraceCredentials = new BacktraceCredentials(Uri.parse(legacyUrl));
         assertEquals(fakeToken, backtraceCredentials.getSubmissionToken());
     }
+
+    @Test
+    public void generateEmptyTokenForInvalidSubmissionUrl() {
+        BacktraceCredentials backtraceCredentials = new BacktraceCredentials("https://submit.backtrace.io/");
+        assertNull(backtraceCredentials.getSubmissionToken());
+    }
+
+    @Test
+    public void generateEmptyTokenForInvalidLegacyUrl() {
+        BacktraceCredentials backtraceCredentials = new BacktraceCredentials("https://universe.sp.backtrace.io/");
+        assertNull(backtraceCredentials.getSubmissionToken());
+    }
 }

backtrace-library/src/main/java/backtraceio/library/BacktraceCredentials.java

@@ -118,10 +118,19 @@ public String getSubmissionToken() {
         final int tokenLength = 64;
         final String tokenQueryParam = "token=";
         String submissionUrl = getSubmissionUrl().toString();
+        final int tokenEndIndex = submissionUrl.lastIndexOf("/");
         if (submissionUrl.contains("submit.backtrace.io")) {
-            return submissionUrl.substring(submissionUrl.lastIndexOf("/") - tokenLength, submissionUrl.lastIndexOf("/"));
+            if (tokenEndIndex - tokenLength < 0) {
+                return null;
+            }
+            return submissionUrl.substring(tokenEndIndex - tokenLength, tokenEndIndex);
+        }
+        final int tokenQueryParamStartIndex = submissionUrl.indexOf(tokenQueryParam);
+        if (tokenQueryParamStartIndex == -1) {
+            return null;
         }
-        final int tokenQueryParamStartIndex = submissionUrl.indexOf(tokenQueryParam) + tokenQueryParam.length();
-        return submissionUrl.substring(tokenQueryParamStartIndex, tokenQueryParamStartIndex + tokenLength);
+
+        final int tokenParamStartIndex = tokenQueryParamStartIndex + tokenQueryParam.length();
+        return submissionUrl.substring(tokenParamStartIndex, tokenParamStartIndex + tokenLength);
     }
 }

backtrace-library/src/main/java/backtraceio/library/base/BacktraceBase.java

@@ -567,15 +567,16 @@ private OnServerResponseEventListener getDatabaseCallback(final BacktraceDatabas
         return new OnServerResponseEventListener() {
             @Override
             public void onEvent(BacktraceResult backtraceResult) {
-                if (customCallback != null) {
-                    customCallback.onEvent(backtraceResult);
-                }
                 if (record != null) {
                     record.close();
                 }
                 if (backtraceResult != null && backtraceResult.status == BacktraceResultStatus.Ok) {
                     database.delete(record);
                 }
+
+                if (customCallback != null) {
+                    customCallback.onEvent(backtraceResult);
+                }
             }
         };
     }