chore: fix native android feature flags

Author: AndrewAminInstabug

android/native.gradle

@@ -1,5 +1,5 @@
 project.ext.instabug = [
-    version: '13.4.1'
+    version: '13.4.1.6273165-SNAPSHOT'
 ]
 
 dependencies {

android/src/main/java/com/instabug/reactlibrary/RNInstabugNetworkLoggerModule.java

@@ -1,6 +1,10 @@
 package com.instabug.reactlibrary;
 
 
+import static com.instabug.apm.configuration.cp.APMFeature.APM_NETWORK_PLUGIN_INSTALLED;
+import static com.instabug.apm.configuration.cp.APMFeature.CP_NATIVE_INTERCEPTION_ENABLED;
+import static com.instabug.apm.configuration.cp.APMFeature.NETWORK_INTERCEPTION_ENABLED;
+
 import androidx.annotation.NonNull;
 
 //import com.facebook.react.bridge.Arguments;
@@ -12,6 +16,7 @@
 //import com.instabug.apm.sanitization.OnCompleteCallback;
 //import com.instabug.apm.sanitization.VoidSanitizer;
 //import com.instabug.library.logging.listeners.networklogs.NetworkLogSnapshot;
+import com.instabug.apm.InternalAPM;
 import com.instabug.reactlibrary.utils.EventEmitterModule;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 //
@@ -46,6 +51,10 @@ public void removeListeners(Integer count) {
         super.removeListeners(count);
     }
 
+    private boolean getFlagValue(String key) {
+        return InternalAPM._isFeatureEnabledCP( key , "");
+    }
+
     /**
      * Get first time Value of [cp_native_interception_enabled] flag
      */
@@ -55,7 +64,7 @@ public void isNativeInterceptionEnabled(Promise promise) {
             @Override
             public void run() {
                 try {
-                    promise.resolve(true);
+                    promise.resolve(getFlagValue(CP_NATIVE_INTERCEPTION_ENABLED));
                 } catch (Exception e) {
                     e.printStackTrace();
                     promise.resolve(false);
@@ -76,7 +85,7 @@ public void hasAPMNetworkPlugin(Promise promise) {
             @Override
             public void run() {
                 try {
-                    promise.resolve(true);
+                    promise.resolve(getFlagValue(APM_NETWORK_PLUGIN_INSTALLED));
                 } catch (Exception e) {
                     e.printStackTrace();
                     promise.resolve(false);
@@ -97,7 +106,7 @@ public void isAPMNetworkEnabled(Promise promise) {
             @Override
             public void run() {
                 try {
-                    promise.resolve(true);
+                    promise.resolve(getFlagValue(NETWORK_INTERCEPTION_ENABLED));
                 } catch (Exception e) {
                     e.printStackTrace();
                     promise.resolve(false);
@@ -108,7 +117,6 @@ public void run() {
     }
 
 
-
 //    @ReactMethod
 //    public void registerNetworkLogsListener() {
 //        MainThreadHandler.runOnMainThread(new Runnable() {

examples/default/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
+apply plugin: 'instabug-apm'
 
 import com.android.build.OutputFile
 
@@ -95,6 +96,12 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+instabug {
+    apm {
+//        networkEnabled = true
+//        debugEnabled = true
+    }
+}
 android {
     ndkVersion rootProject.ext.ndkVersion
 

examples/default/android/app/src/main/res/xml/network_security_config.xml

@@ -12,4 +12,12 @@
             <certificates src="user" />
         </trust-anchors>
     </base-config>
+
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
 </network-security-config>

examples/default/android/build.gradle

@@ -14,11 +14,19 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url "https://mvn.instabug.com/nexus/repository/instabug-internal/"
+            credentials {
+                username "instabug"
+                password System.getenv("INSTABUG_REPOSITORY_PASSWORD")
+            }
+        }
     }
     dependencies {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath 'com.instabug.library:instabug-plugin:13.4.1.6273165-SNAPSHOT'
     }
 }
 
@@ -28,6 +36,13 @@ allprojects {
             url("$rootDir/../node_modules/detox/Detox-android")
         }
 
+        maven {
+            url "https://mvn.instabug.com/nexus/repository/instabug-internal/"
+            credentials {
+                username "instabug"
+                password System.getenv("INSTABUG_REPOSITORY_PASSWORD")
+            }
+        }
         maven {
             credentials {
                 username System.getenv("DREAM11_MAVEN_USERNAME")

examples/default/ios/Podfile.lock

@@ -475,7 +475,7 @@ PODS:
   - RNGestureHandler (2.13.4):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - RNInstabug (13.3.0):
+  - RNInstabug (13.4.0):
     - Instabug (= 13.4.2)
     - React-Core
   - RNReanimated (3.5.4):
@@ -750,7 +750,7 @@ SPEC CHECKSUMS:
   ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
-  RNInstabug: 3bd51c9e01a076ed5b0bc0a10590e34272dff2fb
+  RNInstabug: 8e7eb1df3f35b935dda661f5bb475f37cef595e6
   RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
   RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
   RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9

src/modules/Instabug.ts

@@ -43,10 +43,10 @@ let _lastScreen: string | null = null;
 let _isFirstScreen = false;
 const firstScreen = 'Initial Screen';
 let _currentAppState = AppState.currentState;
-let isNativeInterceptionFeatureEnabled = false;
-let hasAPMNetworkPlugin = false;
-let isAPMNetworkEnabled = false;
-let shouldEnableNativeInterception = false; // used to disable APM logging inside reportNetworkLog() -> NativeAPM.networkLogAndroid()
+let isNativeInterceptionFeatureEnabled = false; // Checks the value of "cp_native_interception_enabled" backend flag.
+let hasAPMNetworkPlugin = false; // Android only: checks if the APM plugin is installed.
+let isAPMNetworkEnabled = false; // Android only: checks if (APM enabled && Network enabled).
+let shouldEnableNativeInterception = false; // Android: used to disable APM logging inside reportNetworkLog() -> NativeAPM.networkLogAndroid(), iOS: used to control native interception (true == enabled , false == disabled)
 
 /**
  * Enables or disables Instabug functionality.
@@ -188,7 +188,7 @@ const handleNetworkInterceptionMode = (config: InstabugConfig) => {
 
   if (Platform.OS === 'android') {
     checkNativeInterceptionForAndroid(config);
-    config.networkInterceptionMode = NetworkInterceptionMode.javascript; // Need to enable JS interceptor in all scenarios for core network logs
+    config.networkInterceptionMode = NetworkInterceptionMode.javascript; // Need to enable JS interceptor in all scenarios for Bugs & Crashes network logs
   } else if (Platform.OS === 'ios') {
     checkNativeInterceptionForIOS(config);
   }
@@ -224,6 +224,7 @@ const checkNativeInterceptionForAndroid = (config: InstabugConfig) => {
       if (hasAPMNetworkPlugin) {
         console.error(InstabugConstants.IBG_APM_TAG + 'Native interception is disabled');
       } else {
+        shouldEnableNativeInterception = false; // rollback to use JS interceptor for APM & Core.
         console.error(
           InstabugConstants.IBG_APM_TAG +
             'Native interception is disabled and plugin is not installed',