Merge branch 'master' of github.com:getsentry/sentry-android into feat/ndk-submodule

Author: bruno-garcia

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -5,7 +5,10 @@
 import io.sentry.core.SentryLevel;
 import io.sentry.core.SentryOptions;
 import java.io.File;
+<<<<<<< HEAD
 import java.lang.reflect.Method;
+=======
+>>>>>>> 4e57e30dc213ea5cc7e328d05f565f5aeb9b5c8b
 
 class AndroidOptionsInitializer {
   static void init(SentryOptions options, Context context) {
@@ -20,6 +23,7 @@ static void init(SentryOptions options, Context context, ILogger logger) {
     options.setSentryClientName("sentry.java.android/0.0.1");
 
     ManifestMetadataReader.applyMetadata(context, options);
+    createsEnvelopeDirPath(options, context);
 
     if (options.isEnableNdk()) {
       try {
@@ -46,4 +50,13 @@ static void init(SentryOptions options, Context context, ILogger logger) {
     options.addEventProcessor(new DefaultAndroidEventProcessor(context, options));
     options.setSerializer(new AndroidSerializer(options.getLogger()));
   }
+
+  private static void createsEnvelopeDirPath(SentryOptions options, Context context) {
+    File cacheDir = context.getCacheDir().getAbsoluteFile();
+    File envelopesDir = new File(cacheDir, "sentry-envelopes");
+    if (!envelopesDir.exists()) {
+      envelopesDir.mkdirs();
+    }
+    options.setCacheDirPath(envelopesDir.getAbsolutePath());
+  }
 }

sentry-android-core/src/test/java/io/sentry/android/core/AndroidOptionsInitializerTest.kt

@@ -5,12 +5,15 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
 import io.sentry.core.ILogger
 import io.sentry.core.SentryOptions
+import java.io.File
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
@@ -25,9 +28,7 @@ class AndroidOptionsInitializerTest {
     @Test
     fun `logger set to AndroidLogger`() {
         val sentryOptions = SentryOptions()
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
 
         AndroidOptionsInitializer.init(sentryOptions, mockContext)
         val logger = sentryOptions.javaClass.declaredFields.first { it.name == "logger" }
@@ -41,13 +42,30 @@ class AndroidOptionsInitializerTest {
     @Test
     fun `AndroidEventProcessor added to processors list`() {
         val sentryOptions = SentryOptions()
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
         val mockLogger = mock<ILogger>()
 
         AndroidOptionsInitializer.init(sentryOptions, mockContext, mockLogger)
         val actual = sentryOptions.eventProcessors.firstOrNull { it::class == DefaultAndroidEventProcessor::class }
         assertNotNull(actual)
     }
+
+    @Test
+    fun `envelopesDir should be created at initialization`() {
+        val sentryOptions = SentryOptions()
+        val mockContext = createMockContext()
+        val mockLogger = mock<ILogger>()
+
+        AndroidOptionsInitializer.init(sentryOptions, mockContext, mockLogger)
+
+        assertTrue(sentryOptions.cacheDirPath.endsWith("${File.separator}cache${File.separator}sentry-envelopes"))
+    }
+
+    private fun createMockContext(): Context {
+        val mockContext = mock<Context> {
+            on { applicationContext } doReturn context
+        }
+        whenever(mockContext.cacheDir).thenReturn(File("${File.separator}cache"))
+        return mockContext
+    }
 }

sentry-android-core/src/test/java/io/sentry/android/core/SentryInitProviderTest.kt

@@ -12,6 +12,7 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.sentry.core.InvalidDsnException
 import io.sentry.core.Sentry
+import java.io.File
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertFailsWith
@@ -46,9 +47,7 @@ class SentryInitProviderTest {
         assertFalse(Sentry.isEnabled())
         providerInfo.authority = AUTHORITY
 
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
         val metaData = Bundle()
         mockMetaData(mockContext, metaData)
 
@@ -66,9 +65,7 @@ class SentryInitProviderTest {
         assertFalse(Sentry.isEnabled())
         providerInfo.authority = AUTHORITY
 
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
         val metaData = Bundle()
         mockMetaData(mockContext, metaData)
 
@@ -86,9 +83,7 @@ class SentryInitProviderTest {
         assertFalse(Sentry.isEnabled())
         providerInfo.authority = AUTHORITY
 
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
         val metaData = Bundle()
         mockMetaData(mockContext, metaData)
 
@@ -106,9 +101,7 @@ class SentryInitProviderTest {
         assertFalse(Sentry.isEnabled())
         providerInfo.authority = AUTHORITY
 
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
         val metaData = Bundle()
         mockMetaData(mockContext, metaData)
 
@@ -124,9 +117,7 @@ class SentryInitProviderTest {
         assertFalse(Sentry.isEnabled())
         providerInfo.authority = AUTHORITY
 
-        val mockContext = mock<Context> {
-            on { applicationContext } doReturn context
-        }
+        val mockContext = createMockContext()
         val metaData = Bundle()
         mockMetaData(mockContext, metaData)
 
@@ -148,6 +139,14 @@ class SentryInitProviderTest {
         mockApplicationInfo.metaData = metaData
     }
 
+    private fun createMockContext(): Context {
+        val mockContext = mock<Context> {
+            on { applicationContext } doReturn context
+        }
+        whenever(mockContext.cacheDir).thenReturn(File("${File.separator}cache"))
+        return mockContext
+    }
+
     companion object {
         private const val AUTHORITY = "io.sentry.sample.SentryInitProvider"
     }

sentry-core/src/main/java/io/sentry/core/SentryOptions.java

@@ -18,6 +18,7 @@ public class SentryOptions {
   private ISerializer serializer;
   private String sentryClientName;
   private BeforeSecondCallback beforeSend;
+  private String cacheDirPath;
 
   public void addEventProcessor(EventProcessor eventProcessor) {
     eventProcessors.add(eventProcessor);
@@ -102,6 +103,14 @@ public void setBeforeSend(BeforeSecondCallback beforeSend) {
     this.beforeSend = beforeSend;
   }
 
+  public String getCacheDirPath() {
+    return cacheDirPath;
+  }
+
+  public void setCacheDirPath(String cacheDirPath) {
+    this.cacheDirPath = cacheDirPath;
+  }
+
   public interface BeforeSecondCallback {
     SentryEvent execute(SentryEvent event);
   }