fix(android): Leaking listeners

packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java

@@ -24,6 +24,18 @@ public class PerformanceModule extends ReactContextBaseJavaModule implements Tur
     private static boolean eventsBuffered = true;
     private static final Queue<PerformanceEntry> markBuffer = new ConcurrentLinkedQueue<>();
     private static boolean didEmit = false;
+    private final ReactMarker.MarkerListener markerListener = (name, tag, instanceKey) -> {
+        switch (name) {
+            case CONTENT_APPEARED:
+                eventsBuffered = false;
+                emitNativeStartupTime();
+                emitBufferedMarks();
+                break;
+            case RELOAD:
+                eventsBuffered = true;
+                break;
+        }
+    };
 
     public PerformanceModule(@NonNull final ReactApplicationContext reactContext) {
         super(reactContext);
@@ -118,25 +130,24 @@ public String getName() {
         return PERFORMANCE_MODULE;
     }
 
+    @Override
+    public void addListener(String eventName) {
+
+    }
+
+    @Override
+    public void removeListeners(double count) {
+
+    }
+
     private void emitNativeStartupTime() {
         safelyEmitMark(new PerformanceMark("nativeLaunchStart", StartTimeProvider.getStartTime()));
         safelyEmitMark(new PerformanceMark("nativeLaunchEnd", StartTimeProvider.getEndTime()));
     }
 
     private void setupMarkerListener() {
         ReactMarker.addListener(
-                (name, tag, instanceKey) -> {
-                    switch (name) {
-                        case CONTENT_APPEARED:
-                            eventsBuffered = false;
-                            emitNativeStartupTime();
-                            emitBufferedMarks();
-                            break;
-                        case RELOAD:
-                            eventsBuffered = true;
-                            break;
-                    }
-                }
+                markerListener
         );
     }
 
@@ -215,13 +226,9 @@ public void logMarker(PerformanceEntry entry) {
     }
 
     @Override
-    public void onCatalystInstanceDestroy() {
-        super.onCatalystInstanceDestroy();
+    public void invalidate() {
+        super.invalidate();
         RNPerformance.getInstance().removeListener(this);
-    }
-
-    // Fix new arch runtime error
-    public void addListener(String eventName) {
-
+        ReactMarker.removeListener(markerListener);
     }
 }

packages/react-native-performance/android/src/main/java/com/oblador/performance/RNPerformance.java

@@ -43,7 +43,7 @@ protected void addListener(MarkerListener listener) {
 
     @DoNotStrip
     protected void removeListener(MarkerListener listener) {
-        if (!sListeners.contains(listener)) {
+        if (sListeners.contains(listener)) {
             sListeners.remove(listener);
         }
     }