Testbed update for Mobileboost tests

Author: nsingh-branch

Branch-SDK-TestBed/src/main/AndroidManifest.xml

@@ -114,7 +114,7 @@
         </activity>
 
         <activity android:name="io.branch.branchandroidtestbed.SettingsActivity" />
-
+        <activity android:name="io.branch.branchandroidtestbed.LogOutputActivity" />
         <activity android:name="io.branch.branchandroidtestbed.AutoDeepLinkTestActivity">
             <!-- Keys for auto deep linking this activity -->
             <meta-data

Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/CustomBranchApp.java

@@ -3,6 +3,10 @@
 import android.app.Application;
 import android.util.Log;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+
 import io.branch.interfaces.IBranchLoggingCallbacks;
 import io.branch.referral.Branch;
 import io.branch.referral.BranchLogger;
@@ -12,14 +16,37 @@ public final class CustomBranchApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-      
-        IBranchLoggingCallbacks iBranchLoggingCallbacks = new IBranchLoggingCallbacks() {
+
+        IBranchLoggingCallbacks loggingCallbacks = new IBranchLoggingCallbacks() {
             @Override
-            public void onBranchLog(String logMessage, String severityConstantName) {
-                Log.v( "CustomTag", logMessage);
+            public void onBranchLog(String tag, String message) {
+                String logMessage = tag + ": " + message;
+                Log.d("BranchTestbed", logMessage);
+                saveLogToFile(logMessage);
             }
         };
-        Branch.enableLogging(BranchLogger.BranchLogLevel.VERBOSE); // Pass in iBranchLoggingCallbacks to enable logging redirects
+        Branch.enableLogging(loggingCallbacks);
         Branch.getAutoInstance(this);
     }
+
+    private void saveLogToFile(String logMessage) {
+        File logFile = new File(getFilesDir(), "branchlogs.txt");
+
+        try {
+            if (!logFile.exists()) {
+                boolean fileCreated = logFile.createNewFile();
+                Log.d("BranchTestbed", "Log file created: " + fileCreated);
+            }
+
+            try (FileOutputStream fos = new FileOutputStream(logFile, true);
+                 OutputStreamWriter writer = new OutputStreamWriter(fos)) {
+                writer.write(logMessage + "\n");
+            }
+
+        } catch (Exception e) {
+            Log.e("BranchTestbed", "Error writing to log file", e);
+        }
+    }
+
+
 }

Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/LogOutputActivity.java

@@ -0,0 +1,77 @@
+package io.branch.branchandroidtestbed;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+
+public class LogOutputActivity extends Activity {
+    private TextView logOutputTextView;
+    private File logFile;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_log_output);
+
+        logOutputTextView = findViewById(R.id.logOutputTextView);
+        logFile = new File(getFilesDir(), "branchlogs.txt");
+        displayLogs();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_log_output, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_clear_logs) {
+            clearLogs();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void displayLogs() {
+        if (logFile.exists()) {
+            StringBuilder logContent = new StringBuilder();
+
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(logFile)))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    logContent.append(line).append("\n");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                logContent.append("Error reading log file.");
+            }
+
+            logOutputTextView.setText(logContent.toString());
+        } else {
+            logOutputTextView.setText("Log file not found.");
+        }
+    }
+
+    private void clearLogs() {
+        if (logFile.exists()) {
+            if (logFile.delete()) {
+                Toast.makeText(this, "Logs cleared.", Toast.LENGTH_SHORT).show();
+                logOutputTextView.setText("Logs cleared.");
+                finish();
+            } else {
+                Toast.makeText(this, "Failed to clear logs.", Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            Toast.makeText(this, "No log file to clear.", Toast.LENGTH_SHORT).show();
+        }
+    }
+}

Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java

@@ -414,6 +414,13 @@ public void onChannelSelected(String channelName) {
             }
         });
 
+        findViewById(R.id.viewLogsButton).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, LogOutputActivity.class);
+                startActivity(intent);
+            }
+        });
 
         findViewById(R.id.notif_btn).setOnClickListener(new OnClickListener() {
             @Override

Branch-SDK-TestBed/src/main/res/drawable/baseline_document_scanner_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
+    
+</vector>

Branch-SDK-TestBed/src/main/res/layout/activity_log_output.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/logOutputTextView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="16dp"
+        android:textSize="14sp"
+        android:text="Logs will appear here" />
+</RelativeLayout>

Branch-SDK-TestBed/src/main/res/layout/main_activity.xml

@@ -133,6 +133,13 @@
                 android:text="Misc."
                 />
 
+            <Button
+                android:id="@+id/viewLogsButton"
+                style="@style/testbed_button_style"
+                android:drawableStart="@drawable/baseline_document_scanner_24"
+                android:text="Load Branch Logs" />
+
+
             <Button
                 android:id="@+id/notif_btn"
                 style="@style/testbed_button_style"

Branch-SDK-TestBed/src/main/res/menu/menu_log_output.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_clear_logs"
+        android:title="Clear Logs"
+        android:showAsAction="always" />
+</menu>

Branch-SDK/src/main/java/io/branch/referral/Branch.java

@@ -2596,13 +2596,15 @@ public static void setFBAppID(String fbAppID) {
      */
     public void setConsumerProtectionAttributionLevel(Defines.BranchAttributionLevel level) {
         prefHelper_.setConsumerProtectionAttributionLevel(level);
+        BranchLogger.v("Set Consumer Protection Preference to " + level);
 
         if (level == Defines.BranchAttributionLevel.NONE) {
             trackingController.disableTracking(context_, true, null);
         } else {
-            trackingController.disableTracking(context_, false, null);
+            if (initState_ != SESSION_STATE.INITIALISED) {
+                trackingController.disableTracking(context_, false, null);
+            }
         }
 
-        BranchLogger.v("Set Consumer Protection Preference to " + level);
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
-#Sun Apr 07 13:06:19 PDT 2024
+#Wed Nov 06 12:51:09 PST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists