Merge branch 'release-candidate/3.7.8' into release-3.7.10

# Conflicts:
#	CHANGELOG.md

Author: Bartosz Litwiniuk

.github/workflows/test.yml

@@ -29,7 +29,9 @@ jobs:
 
       - name: Write to local.properties
         run: |
-          echo BACKTRACE_SUBMISSION_URL=\"https://submit.backtrace.io/yolo/2dd86e8e779d1fc7e22e7b19a9489abeedec3b1426abe7e2209888e92362fba4/json\" > ./local.properties
+          echo BACKTRACE_SUBMISSION_URL=\"${{ secrets.BACKTRACE_SUBMISSION_URL }}\" >> ./local.properties
+          echo BACKTRACE_CORONER_URL=\"${{ secrets.BACKTRACE_CORONER_URL }}\" >> ./local.properties
+          echo BACKTRACE_CORONER_TOKEN=\"${{ secrets.BACKTRACE_CORONER_TOKEN }}\" >> ./local.properties
 
       - name: Build and check
         run: ./gradlew assembleDebug assembleDebugAndroidTest build check

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Backtrace Android Release Notes
 
+## Version 3.7.10
+- Add integration tests
+- Move common http response processing method to helper class
+- Remove unused code
+- Add abstraction to gson serialization
+- Improve example-app Main Activity to work in same way on different Android versions
+
 ## Version 3.7.9
 
 - Fixed problem when thread is trying to delete already deleted record from db context

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

@@ -297,7 +297,6 @@ public BacktraceResult onRequest(BacktraceData data) {
         };
         backtraceClient.setOnRequestHandler(rh);
 
-
         //WHEN
         for (final String message : messages) {
             backtraceClient.send(new Exception(message), new OnServerResponseEventListener() {
@@ -318,4 +317,4 @@ public void onEvent(BacktraceResult backtraceResult) {
             fail(ex.getMessage());
         }
     }
-}
+}

backtrace-library/src/main/java/backtraceio/library/common/BacktraceSerializeHelper.java

@@ -4,40 +4,34 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import backtraceio.library.common.serialization.BacktraceGsonBuilder;
 import backtraceio.library.models.BacktraceResult;
 
 /**
  * Helper class for serialize and deserialize objects
  */
 public class BacktraceSerializeHelper {
 
-    /**
-     * Deserialize JSON into BacktraceResult object
-     *
-     * @param json JSON string which will be deserialized
-     * @return object created during deserialization of given json string
-     */
-    public static BacktraceResult backtraceResultFromJson(String json) {
-        return new Gson().fromJson(json, BacktraceResult.class);
-    }
-
     /**
      * Serialize given object to JSON string
      *
      * @param object object which will be serialized
      * @return serialized object in JSON string format
      */
     public static String toJson(Object object) {
-        Gson gson = buildGson();
-        return gson.toJson(object);
+        return BacktraceSerializeHelper.toJson(new BacktraceGsonBuilder().buildGson(), object);
     }
 
     public static <T> T fromJson(String json, Class<T> type) {
-        Gson gson = buildGson();
-        return gson.fromJson(json, type);
+        return BacktraceSerializeHelper.fromJson(new BacktraceGsonBuilder().buildGson(), json, type);
+    }
+
+    public static String toJson(Gson gson, Object object) {
+        return gson.toJson(object);
     }
 
-    private static Gson buildGson() {
-        return new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES).create();
+    public static <T> T fromJson(Gson gson, String json, Class<T> type) {
+        return gson.fromJson(json, type);
     }
+
 }

backtrace-library/src/main/java/backtraceio/library/common/serialization/BacktraceGsonBuilder.java

@@ -0,0 +1,13 @@
+package backtraceio.library.common.serialization;
+
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class BacktraceGsonBuilder implements CustomGsonBuilder {
+
+    @Override
+    public Gson buildGson() {
+        return new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES).create();
+    }
+}

backtrace-library/src/main/java/backtraceio/library/common/serialization/CustomGsonBuilder.java

@@ -0,0 +1,7 @@
+package backtraceio.library.common.serialization;
+
+import com.google.gson.Gson;
+
+public interface CustomGsonBuilder {
+    Gson buildGson();
+}

backtrace-library/src/main/java/backtraceio/library/http/HttpHelper.java

@@ -0,0 +1,42 @@
+package backtraceio.library.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+
+import backtraceio.library.logger.BacktraceLogger;
+
+public class HttpHelper {
+    private static final String LOG_TAG = HttpHelper.class.getSimpleName();
+
+    /**
+     * Read response message from HTTP response
+     *
+     * @param urlConnection current HTTP connection
+     * @return response from HTTP request
+     * @throws IOException
+     */
+    public static String getResponseMessage(HttpURLConnection urlConnection) throws IOException {
+        BacktraceLogger.d(LOG_TAG, "Reading response from HTTP request");
+
+        InputStream inputStream;
+        if (urlConnection.getResponseCode() < HttpURLConnection.HTTP_BAD_REQUEST) {
+            inputStream = urlConnection.getInputStream();
+        } else {
+            inputStream = urlConnection.getErrorStream();
+        }
+
+        BufferedReader br = new BufferedReader(new InputStreamReader(
+                inputStream));
+
+        StringBuilder responseStringBuilder = new StringBuilder();
+        String line;
+        while ((line = br.readLine()) != null) {
+            responseStringBuilder.append(line);
+        }
+        br.close();
+        return responseStringBuilder.toString();
+    }
+}

backtrace-library/src/main/java/backtraceio/library/services/BacktraceApi.java

@@ -26,16 +26,6 @@ public class BacktraceApi implements Api {
      */
     private final String reportSubmissionUrl;
 
-    /**
-     * URL to unique events endpoint
-     */
-    private String uniqueEventsSubmissionUrl;
-
-    /**
-     * URL to summed events endpoint
-     */
-    private String summedEventsSubmissionUrl;
-
     /**
      * Event triggered when server respond with error
      */

backtrace-library/src/main/java/backtraceio/library/services/BacktraceReportSender.java

@@ -1,10 +1,6 @@
 package backtraceio.library.services;
 
-import java.io.BufferedReader;
 import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
@@ -14,6 +10,7 @@
 import backtraceio.library.common.MultiFormRequestHelper;
 import backtraceio.library.common.RequestHelper;
 import backtraceio.library.events.OnServerErrorEventListener;
+import backtraceio.library.http.HttpHelper;
 import backtraceio.library.logger.BacktraceLogger;
 import backtraceio.library.models.BacktraceResult;
 import backtraceio.library.models.json.BacktraceReport;
@@ -76,12 +73,12 @@ static BacktraceResult sendReport(String serverUrl, String json, List<String> at
             BacktraceLogger.d(LOG_TAG, "Received response status from Backtrace API for HTTP request is: " + statusCode);
 
             if (statusCode == HttpURLConnection.HTTP_OK) {
-                result = BacktraceSerializeHelper.backtraceResultFromJson(
-                        getResponse(urlConnection)
+                result = BacktraceSerializeHelper.fromJson(
+                        HttpHelper.getResponseMessage(urlConnection), BacktraceResult.class
                 );
                 result.setBacktraceReport(report);
             } else {
-                String message = getResponse(urlConnection);
+                String message = HttpHelper.getResponseMessage(urlConnection);
                 message = (BacktraceStringHelper.isNullOrEmpty(message)) ?
                         urlConnection.getResponseMessage() : message;
                 throw new HttpException(statusCode, String.format("%s: %s", statusCode, message));
@@ -150,7 +147,7 @@ public static EventsResult sendEvents(String serverUrl, String json, EventsPaylo
             if (statusCode == HttpURLConnection.HTTP_OK) {
                 result = new EventsResult(payload, urlConnection.getResponseMessage(), BacktraceResultStatus.Ok, statusCode);
             } else {
-                String message = getResponse(urlConnection);
+                String message = HttpHelper.getResponseMessage(urlConnection);
                 message = (BacktraceStringHelper.isNullOrEmpty(message)) ?
                         urlConnection.getResponseMessage() : message;
                 throw new HttpException(statusCode, String.format("%s: %s", statusCode, message));
@@ -176,33 +173,4 @@ public static EventsResult sendEvents(String serverUrl, String json, EventsPaylo
         }
         return result;
     }
-
-    /**
-     * Read response message from HTTP response
-     *
-     * @param urlConnection current HTTP connection
-     * @return response from HTTP request
-     * @throws IOException
-     */
-    private static String getResponse(HttpURLConnection urlConnection) throws IOException {
-        BacktraceLogger.d(LOG_TAG, "Reading response from HTTP request");
-
-        InputStream inputStream;
-        if (urlConnection.getResponseCode() < HttpURLConnection.HTTP_BAD_REQUEST) {
-            inputStream = urlConnection.getInputStream();
-        } else {
-            inputStream = urlConnection.getErrorStream();
-        }
-
-        BufferedReader br = new BufferedReader(new InputStreamReader(
-                inputStream));
-
-        StringBuilder responseSB = new StringBuilder();
-        String line;
-        while ((line = br.readLine()) != null) {
-            responseSB.append(line);
-        }
-        br.close();
-        return responseSB.toString();
-    }
 }

backtrace-library/src/test/java/backtraceio/library/BacktraceSerializeHelperTest.java

@@ -0,0 +1,42 @@
+package backtraceio.library;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import backtraceio.library.common.BacktraceSerializeHelper;
+import backtraceio.library.models.BacktraceResult;
+import backtraceio.library.models.json.BacktraceReport;
+import backtraceio.library.models.types.BacktraceResultStatus;
+
+public class BacktraceSerializeHelperTest {
+    @Test
+    public void testSerialization() {
+        // GIVEN
+        BacktraceResult backtraceResult = new BacktraceResult(null, "result-message", BacktraceResultStatus.Ok);
+        // WHEN
+        String json = BacktraceSerializeHelper.toJson(backtraceResult);
+        // THEN
+        assertEquals("{\"message\":\"result-message\",\"status\":\"Ok\"}", json);
+    }
+
+    @Test
+    public void testDeserialization() {
+        // GIVEN
+        String json = "{\"_rxid\": \"12345\", \"message\":\"result-message\",\"status\":\"Ok\"}";
+
+        // WHEN
+        BacktraceResult result = BacktraceSerializeHelper.fromJson(json ,BacktraceResult.class);
+
+        // THEN
+        assertNotNull(result);
+        assertEquals("result-message", result.message);
+        assertEquals("12345", result.rxId);
+        assertEquals(BacktraceResultStatus.Ok, result.status);
+        assertNull(result.getBacktraceReport());
+    }
+}