Merge pull request #825 from BranchMetrics/Staging

Release 5.0.0

Author: bklastaitis-branch

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

@@ -51,6 +51,7 @@
         </activity>
 
         <activity android:name="io.branch.branchandroiddemo.CreditHistoryActivity"/>
+        <activity android:name=".SettingsActivity"/>
 
         <activity android:name=".AutoDeepLinkTestActivity">
             <!-- Keys for auto deep linking this activity -->

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

@@ -374,6 +374,14 @@ public void onClick(View view) {
             }
         });
 
+        findViewById(R.id.settings_btn).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
+                startActivity(intent);
+            }
+        });
+
         // Tracking events
         findViewById(R.id.cmdTrackCustomEvent).setOnClickListener(new OnClickListener() {
             @Override

Branch-SDK-TestBed/src/main/java/io/branch/branchandroiddemo/SettingsActivity.java

@@ -0,0 +1,42 @@
+package io.branch.branchandroiddemo;
+
+import android.app.Activity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Switch;
+
+import io.branch.referral.Branch;
+import io.branch.referral.PrefHelper;
+
+public class SettingsActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        setupDisableAdNetworkCalloutsSwitch();
+     }
+
+    void setupDisableAdNetworkCalloutsSwitch() {
+        final Switch disableAdNetworkCalloutsSwitch = findViewById(R.id.disable_ad_network_callouts);
+
+        /*
+         * Initialize switch state from SharedPreferences.
+         */
+        final PrefHelper prefHelper = PrefHelper.getInstance(this);
+        disableAdNetworkCalloutsSwitch.setChecked(prefHelper.getAdNetworkCalloutsDisabled());
+
+        /*
+         * Update the setting whenever the switch changes state.
+         */
+        disableAdNetworkCalloutsSwitch.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Branch.getInstance().disableAdNetworkCallouts(disableAdNetworkCalloutsSwitch.isChecked());
+            }
+        });
+
+    }
+}

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

@@ -149,6 +149,14 @@
                 android:text="Fire notif"
                 android:layout_marginTop="20dp"/>
 
+            <Button
+                android:id="@+id/settings_btn"
+                style="@style/testbed_button_style"
+                android:layout_below="@+id/notif_btn"
+                android:layout_centerHorizontal="true"
+                android:text="@string/settings"
+                android:layout_marginTop="20dp"/>
+
         </RelativeLayout>
 
     </ScrollView>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="@string/disable_ad_network_callouts"/>
+        <Switch
+            android:id="@+id/disable_ad_network_callouts"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+</LinearLayout>

Branch-SDK-TestBed/src/main/res/values/strings.xml

@@ -11,4 +11,6 @@
     <string name="launch_mode_branch">"Launched by Branch on auto deep linking!"</string>
     <string name="launch_mode_normal">"Launched by normal application flow"</string>
 
+    <string name="disable_ad_network_callouts">Disable ad network callouts</string>
+    <string name="settings">Settings</string>
 </resources>

Branch-SDK/src/androidTest/java/io/branch/referral/PrefHelperTest.java

@@ -6,7 +6,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-
 public class PrefHelperTest extends BranchTest {
 
     void assertDefaultURL() {
@@ -53,4 +52,22 @@ public void testSetAPIUrl_InvalidEmpty() {
         PrefHelper.setAPIUrl("");
         assertDefaultURL();
     }
+
+    @Test
+    public void testSetAdNetworkCalloutsDisabled() {
+        Context context = getTestContext();
+        PrefHelper prefHelper = PrefHelper.getInstance(context);
+        prefHelper.setAdNetworkCalloutsDisabled(true);
+
+        Assert.assertTrue(prefHelper.getAdNetworkCalloutsDisabled());
+    }
+
+    @Test
+    public void testSetAdNetworkCalloutsEnabled() {
+        Context context = getTestContext();
+        PrefHelper prefHelper = PrefHelper.getInstance(context);
+        prefHelper.setAdNetworkCalloutsDisabled(false);
+
+        Assert.assertFalse(prefHelper.getAdNetworkCalloutsDisabled());
+    }
 }