Remove androidx.annotation to fix duplicate class issue

Kyant0 · Dec 2, 2024 · e2dc33a · e2dc33a
1 parent 2fc0305
commit e2dc33a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 96 deletions.
diff --git a/fishnet/src/main/java/androidx/annotation/NonNull.java b/fishnet/src/main/java/androidx/annotation/NonNull.java
diff --git a/fishnet/src/main/java/androidx/annotation/Nullable.java b/fishnet/src/main/java/androidx/annotation/Nullable.java
diff --git a/fishnet/src/main/java/com/kyant/fishnet/Fishnet.java b/fishnet/src/main/java/com/kyant/fishnet/Fishnet.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import androidx.annotation.NonNull;
+import java.util.Objects;
 
 /**
  * Fishnet is an Android library that dumps Java and native crashes.
@@ -19,7 +19,10 @@ private Fishnet() {
      * @param context Application context
      * @param path    Absolute path to store crash logs
      */
-    public static void init(@NonNull Context context, @NonNull String path) {
+    public static void init(Context context, String path) {
+        Objects.requireNonNull(context, "context must not be null");
+        Objects.requireNonNull(path, "path must not be null");
+
         NativeSignalHandler.init(context, path);
         JavaExceptionHandler.init();
     }

diff --git a/fishnet/src/main/java/com/kyant/fishnet/JavaExceptionHandler.java b/fishnet/src/main/java/com/kyant/fishnet/JavaExceptionHandler.java
@@ -1,7 +1,5 @@
 package com.kyant.fishnet;
 
-import androidx.annotation.NonNull;
-
 import java.util.Map;
 
 final class JavaExceptionHandler {
@@ -32,17 +30,15 @@ public static void init() {
         Thread.setDefaultUncaughtExceptionHandler(handler);
     }
 
-    @NonNull
-    private static String getStackTraceString(@NonNull StackTraceElement[] stackTrace) {
+    private static String getStackTraceString(StackTraceElement[] stackTrace) {
         StringBuilder sb = new StringBuilder(128);
         for (StackTraceElement element : stackTrace) {
             sb.append("at ").append(element).append("\n    ");
         }
         return sb.toString();
     }
 
-    @NonNull
-    private static String getAllStackTracesExcept(@NonNull Thread excludedThread) {
+    private static String getAllStackTracesExcept(Thread excludedThread) {
         StringBuilder sb = new StringBuilder(128);
         for (Map.Entry<Thread, StackTraceElement[]> entry : Thread.getAllStackTraces().entrySet()) {
             Thread t = entry.getKey();
@@ -53,13 +49,16 @@ private static String getAllStackTracesExcept(@NonNull Thread excludedThread) {
                 sb.append('\n');
             }
         }
+        int len = sb.length();
+        if (len > 0) {
+            sb.deleteCharAt(len - 1);
+        }
         return sb.toString();
     }
 
     /**
      * @noinspection unused
      */
-    @NonNull
     private static String dumpJavaThreads() {
         StringBuilder sb = new StringBuilder(1024);
         for (Map.Entry<Thread, StackTraceElement[]> entry : Thread.getAllStackTraces().entrySet()) {
@@ -69,11 +68,14 @@ private static String dumpJavaThreads() {
             sb.append(getStackTraceString(stackTrace));
             sb.append('\n');
         }
+        int len = sb.length();
+        if (len > 0) {
+            sb.deleteCharAt(len - 1);
+        }
         return sb.toString();
     }
 
-    @NonNull
-    private static String toLogString(@NonNull Thread t) {
+    private static String toLogString(Thread t) {
         return "\"" + t.getName() + "\" " + (t.isDaemon() ? "daemon " : "") +
                 "prio=" + t.getPriority() + " id=" + t.getId() + "\n" +
                 "   java.lang.Thread.State=" + t.getState();

diff --git a/fishnet/src/main/java/com/kyant/fishnet/NativeSignalHandler.java b/fishnet/src/main/java/com/kyant/fishnet/NativeSignalHandler.java
@@ -7,13 +7,11 @@
 import android.content.pm.SigningInfo;
 import android.os.Build;
 
-import androidx.annotation.NonNull;
-
 final class NativeSignalHandler {
     private NativeSignalHandler() {
     }
 
-    static void init(@NonNull Context context, @NonNull String path) {
+    static void init(Context context, String path) {
         String packageName = context.getPackageName();
 
         PackageInfo packageInfo;
@@ -72,19 +70,19 @@ static void init(@NonNull Context context, @NonNull String path) {
         nativeInit(path, packageName, versionName, versionCode, cert);
     }
 
-    static void dumpJavaCrash(@NonNull String javaStackTraces) {
+    static void dumpJavaCrash(String javaStackTraces) {
         nativeDumpJavaCrash(javaStackTraces);
     }
 
     private static native void nativeInit(
-            @NonNull String path,
-            @NonNull String packageName,
-            @NonNull String versionName,
+            String path,
+            String packageName,
+            String versionName,
             long versionCode,
-            @NonNull String cert
+            String cert
     );
 
-    private static native void nativeDumpJavaCrash(@NonNull String javaStackTraces);
+    private static native void nativeDumpJavaCrash(String javaStackTraces);
 
     static {
         System.loadLibrary("com.kyant.fishnet");

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ android-targetSdk = "35"
 android-buildToolsVersion = "35.0.0"
 android-ndkVersion = "28.0.12674087"
 android-versionCode = "1"
-lib-version = "1.0.0-alpha02"
+lib-version = "1.0.0-alpha03"
 
 agp = "8.9.0-alpha03" # https://androidstudio.googleblog.com
 kotlin = "2.1.0" # https://github.com/JetBrains/kotlin