Address PR feedback

Author: markushi

sentry-android-core/api/sentry-android-core.api

@@ -567,7 +567,7 @@ public class io/sentry/android/core/anr/AnrProfile {
 	public fun <init> (Ljava/util/List;)V
 }
 
-public class io/sentry/android/core/anr/AnrProfileManager : java/io/Closeable {
+public class io/sentry/android/core/anr/AnrProfileManager : java/lang/AutoCloseable {
 	public fun <init> (Lio/sentry/SentryOptions;)V
 	public fun <init> (Lio/sentry/SentryOptions;Ljava/io/File;)V
 	public fun add (Lio/sentry/android/core/anr/AnrStackTrace;)V

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfile.java

@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 
 @ApiStatus.Internal
 public class AnrProfile {
@@ -12,7 +13,7 @@ public class AnrProfile {
   public final long startTimeMs;
   public final long endTimeMs;
 
-  public AnrProfile(List<AnrStackTrace> stacks) {
+  public AnrProfile(final @NotNull List<AnrStackTrace> stacks) {
     this.stacks = new ArrayList<>(stacks.size());
     for (AnrStackTrace stack : stacks) {
       if (stack != null) {

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileManager.java

@@ -10,7 +10,6 @@
 import io.sentry.cache.tape.QueueFile;
 import io.sentry.util.Objects;
 import java.io.ByteArrayInputStream;
-import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -21,7 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 
 @ApiStatus.Internal
-public class AnrProfileManager implements Closeable {
+public class AnrProfileManager implements AutoCloseable {
 
   private static final int MAX_NUM_STACKTRACES =
       (int) ((THRESHOLD_ANR_MS / POLLING_INTERVAL_MS) * 2);
@@ -63,6 +62,8 @@ public AnrProfileManager(final @NotNull SentryOptions options, final @NotNull Fi
               new ObjectQueue.Converter<AnrStackTrace>() {
                 @Override
                 public AnrStackTrace from(final byte[] source) throws IOException {
+                  // no need to close the streams since they are backed by byte arrays and don't
+                  // hold any resources
                   final @NotNull ByteArrayInputStream bis = new ByteArrayInputStream(source);
                   final @NotNull DataInputStream dis = new DataInputStream(bis);
                   return AnrStackTrace.deserialize(dis);
@@ -72,9 +73,10 @@ public AnrStackTrace from(final byte[] source) throws IOException {
                 public void toStream(
                     final @NotNull AnrStackTrace value, final @NotNull OutputStream sink)
                     throws IOException {
-                  final @NotNull DataOutputStream dos = new DataOutputStream(sink);
-                  value.serialize(dos);
-                  dos.flush();
+                  try (final @NotNull DataOutputStream dos = new DataOutputStream(sink)) {
+                    value.serialize(dos);
+                    dos.flush();
+                  }
                   sink.flush();
                 }
               });

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfileRotationHelper.java

@@ -35,12 +35,16 @@ private static void performRotationIfNeeded(final @NotNull File cacheDir) {
       final File currentFile = new File(cacheDir, RECORDING_FILE_NAME);
       final File oldFile = new File(cacheDir, OLD_FILE_NAME);
 
-      if (oldFile.exists()) {
+      try {
         oldFile.delete();
+      } catch (Throwable e) {
+        // ignored
       }
 
-      if (currentFile.exists()) {
+      try {
         currentFile.renameTo(oldFile);
+      } catch (Throwable e) {
+        // ignored
       }
 
       shouldRotate.set(false);

sentry-android-core/src/main/java/io/sentry/android/core/anr/AnrProfilingIntegration.java

@@ -232,6 +232,9 @@ private void clearStacks() throws IOException {
   }
 
   private void addStackTrace(@NotNull final AnrStackTrace trace) throws IOException {
+    if (!enabled.get()) {
+      return;
+    }
     numCollectedStacks.incrementAndGet();
     getProfileManager().add(trace);
   }

sentry-android-core/src/main/java/io/sentry/android/core/anr/StackTraceConverter.java

@@ -5,6 +5,7 @@
 import io.sentry.protocol.profiling.SentrySample;
 import io.sentry.protocol.profiling.SentryThreadMetadata;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -86,8 +87,8 @@ public static SentryProfile convert(final @NotNull AnrProfile anrProfile) {
     threadMetadata.setName(MAIN_THREAD_NAME);
     threadMetadata.setPriority(Thread.NORM_PRIORITY);
 
-    final @NotNull Map<String, SentryThreadMetadata> threadMetadataMap = new HashMap<>();
-    threadMetadataMap.put(MAIN_THREAD_ID, threadMetadata);
+    final @NotNull Map<String, SentryThreadMetadata> threadMetadataMap =
+        Collections.singletonMap(MAIN_THREAD_ID, threadMetadata);
     profile.setThreadMetadata(threadMetadataMap);
 
     return profile;