More testbed edits

Author: nsingh-branch

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

@@ -17,15 +17,12 @@ public final class CustomBranchApp extends Application {
     public void onCreate() {
         super.onCreate();
 
-        IBranchLoggingCallbacks loggingCallbacks = new IBranchLoggingCallbacks() {
-            @Override
-            public void onBranchLog(String tag, String message) {
-                String logMessage = tag + ": " + message;
-                Log.d("BranchTestbed", logMessage);
-                saveLogToFile(logMessage);
-            }
+        IBranchLoggingCallbacks loggingCallbacks = (message, tag) -> {
+            Log.d("BranchTestbed", message);
+            saveLogToFile(message);
         };
         Branch.enableLogging(loggingCallbacks);
+
         Branch.getAutoInstance(this);
     }
 

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

@@ -598,8 +598,18 @@ public void onClick(View v) {
                         .setSearchQuery("product name")
                         .addCustomDataProperty("Custom_Event_Property_Key1", "Custom_Event_Property_val1")
                         .addContentItems(branchUniversalObject)
-                        .logEvent(MainActivity.this);
-                Toast.makeText(getApplicationContext(), "Sent Branch Content Event", Toast.LENGTH_SHORT).show();
+                        .logEvent(MainActivity.this, new BranchEvent.BranchLogEventCallback() {
+                            @Override
+                            public void onSuccess(int responseCode) {
+                                Toast.makeText(getApplicationContext(), "Sent Branch Content Event: " + responseCode, Toast.LENGTH_SHORT).show();
+                            }
+
+                            @Override
+                            public void onFailure(Exception e) {
+                                Log.d("BranchSDK_Tester", e.toString());
+                                Toast.makeText(getApplicationContext(), "Error sending Branch Content Event: " + e.toString(), Toast.LENGTH_SHORT).show();
+                            }
+                        });
             }
         });
 
@@ -613,8 +623,18 @@ public void onClick(View v) {
                         .setDescription("User created an account")
                         .addCustomDataProperty("registrationID", "12345")
                         .addContentItems(branchUniversalObject)
-                        .logEvent(MainActivity.this);
-                Toast.makeText(getApplicationContext(), "Sent Branch Lifecycle Event", Toast.LENGTH_SHORT).show();
+                        .logEvent(MainActivity.this, new BranchEvent.BranchLogEventCallback() {
+                            @Override
+                            public void onSuccess(int responseCode) {
+                                Toast.makeText(getApplicationContext(), "Sent Branch Lifecycle Event: " + responseCode, Toast.LENGTH_SHORT).show();
+                            }
+
+                            @Override
+                            public void onFailure(Exception e) {
+                                Log.d("BranchSDK_Tester", e.toString());
+                                Toast.makeText(getApplicationContext(), "Error sending Branch Lifecycle Event: " + e.toString(), Toast.LENGTH_SHORT).show();
+                            }
+                        });
             }
         });
 

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

@@ -3,11 +3,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/logOutputTextView"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="16dp"
-        android:textSize="14sp"
-        android:text="Logs will appear here" />
+        android:padding="16dp">
+
+        <TextView
+            android:id="@+id/logOutputTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:text="Logs will appear here" />
+    </ScrollView>
 </RelativeLayout>