Releases/v5.1.1

README.md

@@ -1,7 +1,6 @@
-[![Build Status](https://www.bitrise.io/app/562949a18404dad6/status.svg?token=IZE4w-D2xii7QjqvJVc51A&branch=master)](https://www.bitrise.io/app/562949a18404dad6)
 [![Slack Status](https://slack.hockeyapp.net/badge.svg)](https://slack.hockeyapp.net)
 
-## Version 5.1.0
+## Version 5.1.1
 
 HockeySDK-Android implements support for using HockeyApp in your Android applications.
 

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.novoda:bintray-release:0.5.0'
+        classpath 'com.novoda:bintray-release:0.8.0'
     }
 }
 
@@ -37,13 +37,13 @@ allprojects {
 
 ext {
     ARTIFACT_ID = 'HockeySDK'
-    VERSION_NAME = '5.1.0'
-    VERSION_CODE = 19
+    VERSION_NAME = '5.1.1'
+    VERSION_CODE = 20
     SITE_URL = 'https://github.com/bitstadium/hockeysdk-android'
     GIT_URL = 'https://github.com/bitstadium/HockeySDK-Android.git'
     BINTRAY_USER = HOCKEYAPP_BINTRAY_USER
     GROUP_NAME = 'net.hockeyapp.android'
-    COMPILE_SDK = 27
+    COMPILE_SDK = 28
     IS_UPLOADING = project.getGradle().startParameter.taskNames.any{it.contains('bintrayUpload')}
     DESCRIPTION = 'HockeySDK-Android implements support for using HockeyApp in your Android application. The following features are currently supported:\n' +
             '\n' +

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Aug 27 11:31:58 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

hockeysdk/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode VERSION_CODE
         versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -49,17 +49,14 @@ publish {
 }
 
 dependencies {
-    // Mocking
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
-
+    testImplementation 'junit:junit:4.12'
     testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
     testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
     testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.6.6'
 
     androidTestImplementation 'org.hamcrest:hamcrest-core:1.3'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    testImplementation 'junit:junit:4.12'
-
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
 }

hockeysdk/src/androidTest/java/net/hockeyapp/android/ConstantsTest.java

@@ -19,7 +19,7 @@ public class ConstantsTest {
     @Test
     public void testLoadingConstantsWorks() throws Exception {
         Constants.loadFromContext(InstrumentationRegistry.getContext());
-        Constants.LOADING_LATCH.await();
+        Constants.DEVICE_IDENTIFIER.get();
 
         assertNotNull(Constants.BASE_URL);
         assertEquals("https://sdk.hockeyapp.net/", Constants.BASE_URL);

hockeysdk/src/androidTest/java/net/hockeyapp/android/CrashManagerHelper.java

@@ -10,9 +10,9 @@
 
 public class CrashManagerHelper {
 
-    public static void loadConstants(Context context) throws InterruptedException {
+    public static void loadConstants(Context context) throws Exception {
         Constants.loadFromContext(context);
-        Constants.LOADING_LATCH.await();
+        Constants.DEVICE_IDENTIFIER.get();
     }
 
     public static void reset(Context context) {

hockeysdk/src/androidTest/java/net/hockeyapp/android/CrashManagerTest.java

@@ -1,5 +1,6 @@
 package net.hockeyapp.android;
 
+import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -11,11 +12,17 @@
 import org.junit.runner.RunWith;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.lang.ref.WeakReference;
+import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 @RunWith(AndroidJUnit4.class)
 public class CrashManagerTest {
@@ -121,4 +128,42 @@ public void xamarinCrashCorrect() throws Exception {
         Boolean containsCausedByXamarin = throwableStackTrace.contains("Xamarin caused by:");
         assertTrue(containsCausedByXamarin);
     }
+
+    @Test
+    public void invalidStackTrace() throws Exception {
+        File file = new File(filesDirectory, UUID.randomUUID().toString() + ".stacktrace");
+        file.createNewFile();
+
+        CrashManagerListener listener = mock(CrashManagerListener.class);
+        WeakReference<Context> weakContext = new WeakReference<>(InstrumentationRegistry.getTargetContext());
+
+        CrashManager.submitStackTraces(weakContext, listener);
+
+        verify(listener).onCrashesNotSent();
+        assertEquals(0, CrashManager.stackTracesCount);
+    }
+
+    @Test
+    public void largeStackTrace() throws Exception {
+        String stackTrace = "java.lang.OutOfMemoryError: Failed to allocate a 37657308 byte allocation with 16776928 free bytes and 27MB until OOM\n" +
+                "\tat java.lang.String.<init>(String.java:400)\n" +
+                "\tat java.lang.AbstractStringBuilder.toString(AbstractStringBuilder.java:633)\n" +
+                "\tat java.lang.StringBuilder.toString(StringBuilder.java:663)\n" +
+                "\tat net.hockeyapp.android.CrashManager.contentsOfFile(CrashManager.java:772)\n" +
+                "\tat net.hockeyapp.android.CrashManager.submitStackTrace(CrashManager.java:379)\n" +
+                "\tat net.hockeyapp.android.CrashManager.access$500(CrashManager.java:47)\n" +
+                "\tat net.hockeyapp.android.CrashManager$8.doInBackground(CrashManager.java:647)\n" +
+                "\tat net.hockeyapp.android.CrashManager$8.doInBackground(CrashManager.java:639)\n";
+
+        String filename = UUID.randomUUID().toString() + ".stacktrace";
+        File file = new File(filesDirectory, filename);
+        PrintWriter writer = new PrintWriter(file);
+        writer.print(stackTrace);
+        writer.flush();
+        writer.close();
+
+        WeakReference<Context> weakContext = new WeakReference<>(InstrumentationRegistry.getTargetContext());
+        String result = CrashManager.contentsOfFile(weakContext, filename, 500);
+        assertTrue(result.endsWith("submitStackTrace(CrashManager.java:379)\n"));
+    }
 }

hockeysdk/src/androidTest/java/net/hockeyapp/android/TrackingTest.java

@@ -31,7 +31,7 @@ public void setUp() throws Exception {
              * will write to a different preferences key than the test tracking module
              */
             Constants.loadFromContext(mActivityRule.getActivity());
-            Constants.LOADING_LATCH.await();
+            Constants.DEVICE_IDENTIFIER.get();
         }
     }
 

hockeysdk/src/androidTest/java/net/hockeyapp/android/objects/CrashDetailsTest.java

@@ -12,11 +12,20 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
 
 @RunWith(AndroidJUnit4.class)
 public class CrashDetailsTest {
@@ -64,4 +73,58 @@ public void testCrashDetailParsing() throws Exception {
         assertNotNull(details.getAppCrashDate());
         assertTrue("Crash date must be later than initialization date", details.getAppCrashDate().compareTo(details.getAppStartDate()) > 0);
     }
+
+    @Test
+    public void testCrashStacktraceIsTruncated() {
+        Throwable tr = new RuntimeException("Just a test exception");
+        Throwable throwableSpy = Mockito.spy(tr);
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) {
+                PrintWriter writer = (PrintWriter) invocation.getArguments()[0];
+                final int bufferSize = 1024 * 1024;
+                char [] stackTraceBuffer = new char[bufferSize];
+                Arrays.fill(stackTraceBuffer, 0, bufferSize - 1,'0');
+                for(int i = 0; i < 5; i++) {
+                    writer.write(stackTraceBuffer);
+                }
+                return null;
+            }
+        }).when(throwableSpy).printStackTrace(any(PrintWriter.class));
+
+        CrashDetails details = new CrashDetails("id", throwableSpy);
+        assertTrue("Crash stacktrace was not truncated", details.getThrowableStackTrace().length() <= CrashDetails.CRASH_FILE_STACKTRACE_SIZE);
+    }
+
+    @Test
+    public void testXamarinCrashStacktraceIsTruncated() {
+        final int bufferSize = 1024 * 1024;
+        final char [] stackTraceBuffer = new char[bufferSize];
+        Arrays.fill(stackTraceBuffer, 0, bufferSize - 1,'0');
+        Throwable tr = new RuntimeException("Just a test exception");
+        Throwable throwableSpy = Mockito.spy(tr);
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) {
+                PrintWriter writer = (PrintWriter) invocation.getArguments()[0];
+                for(int i = 0; i < 5; i++) {
+                    writer.write(stackTraceBuffer);
+                }
+                return null;
+            }
+        }).when(throwableSpy).printStackTrace(any(PrintWriter.class));
+
+        final String managedException = new StringBuilder()
+                .append(stackTraceBuffer)
+                .append("\n")
+                .append(stackTraceBuffer)
+                .append("\n")
+                .append(stackTraceBuffer)
+                .append("\n")
+                .append(stackTraceBuffer)
+                .toString();
+
+        CrashDetails details = new CrashDetails("id", throwableSpy, managedException, false);
+        final int xamarinHeaderLength = CrashDetails.FIELD_XAMARIN_CAUSED_BY.length();
+        assertTrue("Crash stacktrace was not truncated",
+                details.getThrowableStackTrace().length() <= CrashDetails.CRASH_FILE_STACKTRACE_SIZE + xamarinHeaderLength);
+    }
 }

hockeysdk/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application>
 
         <activity android:name=".UpdateActivity" />
-        <activity android:name=".FeedbackActivity" android:windowSoftInputMode="adjustResize|stateVisible" />
+        <activity android:name=".FeedbackActivity" />
         <activity android:name=".PaintActivity" />
         <activity android:name=".LoginActivity" />
         <activity android:name=".ExpiryInfoActivity" />

hockeysdk/src/main/java/net/hockeyapp/android/Constants.java

@@ -10,13 +10,11 @@
 import android.os.Bundle;
 
 import net.hockeyapp.android.utils.AsyncTaskUtils;
-import net.hockeyapp.android.utils.CompletedFuture;
+import net.hockeyapp.android.utils.LatchFuture;
 import net.hockeyapp.android.utils.HockeyLog;
 
 import java.io.File;
 import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 
 /**
@@ -41,6 +39,8 @@ public class Constants {
 
     public static final String FILES_DIRECTORY_NAME = "HockeyApp";
 
+    public static final int THREAD_STATS_TAG = SDK_NAME.hashCode();
+
     /**
      * The user agent string the SDK will send with every HockeyApp API request.
      */
@@ -85,25 +85,16 @@ public class Constants {
     /**
      * Unique identifier for device, not dependent on package or device.
      */
-    static String DEVICE_IDENTIFIER = null;
+    static LatchFuture<String> DEVICE_IDENTIFIER = new LatchFuture<>();
+
+    private static AsyncTask<Void, Object, String> loadIdentifiersTask;
 
     /**
      * Lock used to wait for loading of identifiers.
      */
-    static CountDownLatch LOADING_LATCH = new CountDownLatch(1);
 
     public static Future<String> getDeviceIdentifier() {
-        if (LOADING_LATCH.getCount() == 0) {
-            return new CompletedFuture<>(DEVICE_IDENTIFIER);
-        }
-        return AsyncTaskUtils.execute(new Callable<String>() {
-
-            @Override
-            public String call() throws Exception {
-                LOADING_LATCH.await();
-                return DEVICE_IDENTIFIER;
-            }
-        });
+        return DEVICE_IDENTIFIER;
     }
 
     /**
@@ -187,11 +178,11 @@ private static int loadBuildNumber(Context context, PackageManager packageManage
      * @param context the context to use. Usually your Activity object.
      */
     @SuppressLint("StaticFieldLeak")
-    private static void loadIdentifiers(final Context context) {
-        if (DEVICE_IDENTIFIER != null) {
+    private static synchronized void loadIdentifiers(final Context context) {
+        if (DEVICE_IDENTIFIER.isDone() || loadIdentifiersTask != null) {
             return;
         }
-        AsyncTaskUtils.execute(new AsyncTask<Void, Object, String>() {
+        AsyncTaskUtils.execute(loadIdentifiersTask = new AsyncTask<Void, Object, String>() {
             @Override
             protected String doInBackground(Void... voids) {
                 final SharedPreferences preferences = context.getSharedPreferences("HockeyApp", Context.MODE_PRIVATE);
@@ -200,13 +191,13 @@ protected String doInBackground(Void... voids) {
                     deviceIdentifier = UUID.randomUUID().toString();
                     preferences.edit().putString("deviceIdentifier", deviceIdentifier).apply();
                 }
+                DEVICE_IDENTIFIER.complete(deviceIdentifier);
                 return deviceIdentifier;
             }
 
             @Override
             protected void onPostExecute(String deviceIdentifier) {
-                DEVICE_IDENTIFIER = deviceIdentifier;
-                LOADING_LATCH.countDown();
+                loadIdentifiersTask = null;
             }
         });
     }