Skip to content

Commit c22fcd0

Browse files
wpinho-branchwpinho-branch
committed
refactor: update Branch SDK initialization to use init() method
- Replace all instances of Branch.getInstance() with Branch.init() across various classes and test files - Ensure consistent usage of the new initialization method to enhance clarity and maintainability - This change is part of the ongoing modernization efforts to streamline the Branch SDK and improve its initialization process
1 parent f69fed6 commit c22fcd0

40 files changed

+168
-219
lines changed

‎Branch-SDK-Automation-TestBed/src/main/java/io/branch/branchandroiddemo/BranchWrapper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void nativeShare(Activity activity, Intent intent, Context ctx) {
7676

7777
if (buo != null && lp != null) {
7878
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
79-
Branch.getInstance().share(activity, buo, lp, "Sharing Branch Short URL", "Using Native Chooser Dialog");
79+
Branch.init().share(activity, buo, lp, "Sharing Branch Short URL", "Using Native Chooser Dialog");
8080
} else {
8181
showLogWindow("Unsupported Version", false, ctx, Constants.UNKNOWN);
8282
}
@@ -116,7 +116,7 @@ public void setIdentity(Intent intent, Context ctx){
116116
TestData testDataObj = new TestData();
117117
String userName = testDataObj.getUserName(testDataStr);
118118
if ( userName != null && (userName.isEmpty() == false)) {
119-
Branch.getInstance().setIdentity(userName);
119+
Branch.init().setIdentity(userName);
120120
} else {
121121
showLogWindow("Invalid username.",true, ctx,Constants.TRACK_USER);
122122
}
@@ -176,7 +176,7 @@ public void setDMAParams(Intent intent){
176176
boolean adPersonalizationConsent = testDataObj.getBoolParamValue(testDataStr,"dma_ad_personalization");
177177
boolean adUserDataUsageConsent = testDataObj.getBoolParamValue(testDataStr,"dma_ad_user_data");
178178

179-
Branch.getInstance().setDMAParamsForEEA(eeaRegion, adPersonalizationConsent, adUserDataUsageConsent);
179+
Branch.init().setDMAParamsForEEA(eeaRegion, adPersonalizationConsent, adUserDataUsageConsent);
180180

181181
} else {
182182
showLogWindow( "Test Data : Null" , true, ctx,Constants.SET_DMA_Params);

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,19 @@
22

33
import io.branch.branchandroiddemo.BranchWrapper;
44

5-
import android.content.Intent;
6-
import android.os.Build;
75
import android.os.Bundle;
8-
import android.util.Log;
96
import android.view.View;
107
import android.widget.Button;
118
import android.widget.TextView;
129
import android.widget.ToggleButton;
1310

1411
import androidx.appcompat.app.AppCompatActivity;
1512

16-
import io.branch.branchandroiddemo.BranchWrapper;
17-
import io.branch.indexing.BranchUniversalObject;
1813
import io.branch.referral.Branch;
19-
import io.branch.referral.BranchError;
2014
import io.branch.referral.BranchLogger;
21-
import io.branch.referral.util.LinkProperties;
2215
import io.branch.branchandroiddemo.Common;
2316
import io.branch.branchandroiddemo.Constants;
2417
import io.branch.branchandroiddemo.R;
25-
import io.branch.branchandroiddemo.TestData;
2618

2719
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
2820
private Button btCreateDeepLink, btNativeShare, btTrackUser,
@@ -66,8 +58,8 @@ protected void onCreate(Bundle savedInstanceState) {
6658

6759
Branch.enableLogging(BranchLogger.BranchLogLevel.VERBOSE);
6860

69-
trackingCntrlBtn.setChecked(Branch.getInstance().isTrackingDisabled());
70-
trackingCntrlBtn.setOnCheckedChangeListener((buttonView, isChecked) -> Branch.getInstance().disableTracking(isChecked));
61+
trackingCntrlBtn.setChecked(Branch.init().isTrackingDisabled());
62+
trackingCntrlBtn.setOnCheckedChangeListener((buttonView, isChecked) -> Branch.init().disableTracking(isChecked));
7163
}
7264

7365
@Override

‎Branch-SDK-TestBed/src/androidTest/java/io/branch/branchandroidtestbed/TrackingControlTestRoutines.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,18 @@ private void runTrackingControlTest(int stateCnt) {
9494
}
9595
if (loadTestCounter < MAX_LOAD_CNT) {
9696
if (loadTestCounter % 5 == 0) {
97-
if (!Branch.getInstance().isTrackingDisabled()) {
97+
if (!Branch.init().isTrackingDisabled()) {
9898
Log.d(TAG, "-- Disabling tracking ");
9999
disableTracking();
100100
}
101101
} else {
102-
if (Branch.getInstance().isTrackingDisabled()) {
102+
if (Branch.init().isTrackingDisabled()) {
103103
Log.d(TAG, "-- Enabling tracking ");
104104
enableTrackingAndProceed(6);
105105
}
106106
}
107107

108-
if (Branch.getInstance().isTrackingDisabled()) {
108+
if (Branch.init().isTrackingDisabled()) {
109109
Log.d(TAG, "-- test " + loadTestCounter + " <Tracking disabled>");
110110
loadTestCounter++;
111111
testBranchEvent(6);
@@ -141,12 +141,12 @@ private boolean testLinkCreation(boolean disableTracking) {
141141
}
142142

143143
private void testBranchEvent(final int stateCnt) {
144-
Branch.getInstance().setIdentity(UUID.randomUUID().toString(), new Branch.BranchReferralInitListener() {
144+
Branch.init().setIdentity(UUID.randomUUID().toString(), new Branch.BranchReferralInitListener() {
145145
@Override
146146
public void onInitFinished(JSONObject referringParams, BranchError error) {
147147
boolean passed;
148148

149-
if (Branch.getInstance().isTrackingDisabled()) {
149+
if (Branch.init().isTrackingDisabled()) {
150150
passed = error != null && error.getErrorCode() == BranchError.ERR_BRANCH_TRACKING_DISABLED;
151151
} else {
152152
passed = (error == null || error.getErrorCode() != BranchError.ERR_BRANCH_TRACKING_DISABLED);
@@ -167,11 +167,11 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
167167

168168

169169
private void disableTracking() {
170-
Branch.getInstance().disableTracking(true);
170+
Branch.init().disableTracking(true);
171171
}
172172

173173
private void enableTrackingAndProceed(final int stateCnt) {
174-
Branch.getInstance().disableTracking(false);
174+
Branch.init().disableTracking(false);
175175
new android.os.Handler().postDelayed(new Runnable() {
176176
@Override
177177
public void run() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected void onResume() {
2222
TextView launch_mode_txt = findViewById(R.id.launch_mode_txt);
2323
if (false) {
2424
launch_mode_txt.setText(R.string.launch_mode_branch);
25-
Branch.getInstance().getLatestReferringParams();
25+
Branch.init().getLatestReferringParams();
2626
} else {
2727
launch_mode_txt.setText(R.string.launch_mode_normal);
2828
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
import java.io.FileOutputStream;
1212
import java.io.OutputStreamWriter;
1313

14-
import io.branch.interfaces.IBranchLoggingCallbacks;
1514
import io.branch.referral.Branch;
1615
import io.branch.referral.BranchLogger;
17-
import io.branch.referral.Defines;
1816

1917
public final class CustomBranchApp extends Application {
2018
@Override
@@ -26,7 +24,7 @@ public void onCreate() {
2624
// saveLogToFile(message);
2725
// };
2826
Branch.enableLogging(BranchLogger.BranchLogLevel.VERBOSE);
29-
Branch branch = Branch.getInstance(this);
27+
Branch branch = Branch.init(this);
3028
CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder()
3129
.setColorScheme(COLOR_SCHEME_DARK)
3230
.build();

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.android.billingclient.api.Purchase;
3131
import com.android.billingclient.api.QueryProductDetailsParams;
3232

33-
import org.json.JSONArray;
3433
import org.json.JSONException;
3534
import org.json.JSONObject;
3635

@@ -70,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
7069

7170
txtShortUrl = findViewById(R.id.editReferralShortUrl);
7271

73-
((ToggleButton) findViewById(R.id.tracking_cntrl_btn)).setChecked(Branch.getInstance().isTrackingDisabled());
72+
((ToggleButton) findViewById(R.id.tracking_cntrl_btn)).setChecked(Branch.init().isTrackingDisabled());
7473

7574
getActionBar().setTitle("Branch Testbed");
7675

@@ -121,7 +120,7 @@ public void onClick(View v) {
121120
public void onClick(DialogInterface dialog, int whichButton) {
122121
String userID = txtUrl.getText().toString();
123122

124-
Branch.getInstance().setIdentity(userID, new BranchReferralInitListener() {
123+
Branch.init().setIdentity(userID, new BranchReferralInitListener() {
125124
@Override
126125
public void onInitFinished(JSONObject referringParams, BranchError error) {
127126
Log.d("BranchSDK_Tester", "Identity set to " + userID + "\nInstall params = " + referringParams.toString());
@@ -149,7 +148,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
149148
@Override
150149
public void onClick(View v) {
151150
String currentUserId = PrefHelper.getInstance(MainActivity.this).getIdentity();
152-
Branch.getInstance().logout();
151+
Branch.init().logout();
153152
Toast.makeText(getApplicationContext(), "Cleared User ID: " + currentUserId, Toast.LENGTH_LONG).show();
154153

155154
}
@@ -158,7 +157,7 @@ public void onClick(View v) {
158157
findViewById(R.id.cmdPrintInstallParam).setOnClickListener(new OnClickListener() {
159158
@Override
160159
public void onClick(View v) {
161-
JSONObject obj = Branch.getInstance().getFirstReferringParams();
160+
JSONObject obj = Branch.init().getFirstReferringParams();
162161
Log.d("BranchSDK_Tester", "install params = " + obj.toString());
163162

164163
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@@ -177,7 +176,7 @@ public void onClick(DialogInterface dialog, int which) {
177176
findViewById(R.id.cmdPrintLatestParam).setOnClickListener(new OnClickListener() {
178177
@Override
179178
public void onClick(View v) {
180-
JSONObject obj = Branch.getInstance().getLatestReferringParams();
179+
JSONObject obj = Branch.init().getLatestReferringParams();
181180
Log.d("BranchSDK_Tester", "Latest params = " + obj.toString());
182181

183182
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@@ -242,7 +241,7 @@ public void onClick(View v) {
242241
if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK && list != null) {
243242
Log.d("BillingClient", "Purchase was successful. Logging event");
244243
for (Object purchase : list) {
245-
Branch.getInstance().logEventWithPurchase(MainActivity.this, (Purchase) purchase);
244+
Branch.init().logEventWithPurchase(MainActivity.this, (Purchase) purchase);
246245
}
247246
}
248247
}
@@ -342,7 +341,7 @@ public void onClick(View view) {
342341
.addControlParameter("$android_deeplink_path", "custom/path/*")
343342
.addControlParameter("$ios_url", "http://example.com/ios")
344343
.setDuration(100);
345-
Branch.getInstance().share(MainActivity.this, branchUniversalObject, linkProperties, "Sharing Branch Short URL", "Using Native Chooser Dialog");
344+
Branch.init().share(MainActivity.this, branchUniversalObject, linkProperties, "Sharing Branch Short URL", "Using Native Chooser Dialog");
346345
}
347346
});
348347

@@ -390,7 +389,7 @@ public void onClick(View v) {
390389
});
391390

392391
((ToggleButton) findViewById(R.id.tracking_cntrl_btn)).setOnCheckedChangeListener((buttonView, isChecked) -> {
393-
Branch.getInstance().disableTracking(isChecked, (trackingDisabled, referringParams, error) -> {
392+
Branch.init().disableTracking(isChecked, (trackingDisabled, referringParams, error) -> {
394393
if (trackingDisabled) {
395394
Toast.makeText(getApplicationContext(), "Disabled Tracking", Toast.LENGTH_LONG).show();
396395
} else {
@@ -420,7 +419,7 @@ public void onClick(View v) {
420419
preference = Defines.BranchAttributionLevel.FULL;
421420
break;
422421
}
423-
Branch.getInstance().setConsumerProtectionAttributionLevel(preference);
422+
Branch.init().setConsumerProtectionAttributionLevel(preference);
424423
Toast.makeText(MainActivity.this, "Consumer Protection Preference set to " + options[which], Toast.LENGTH_LONG).show();
425424
});
426425
builder.create().show();
@@ -573,7 +572,7 @@ public void onFailure(Exception e) {
573572
findViewById(R.id.logout_btn).setOnClickListener(new OnClickListener() {
574573
@Override
575574
public void onClick(View v) {
576-
Branch.getInstance().logout();
575+
Branch.init().logout();
577576
Toast.makeText(getApplicationContext(), "Logged Out", Toast.LENGTH_LONG).show();
578577
}
579578
});
@@ -593,7 +592,7 @@ public void onClick(View v) {
593592
invokeFeatures.put("enhanced_web_link_ux", "IN_APP_WEBVIEW");
594593
invokeFeatures.put("web_link_redirect_url", "https://branch.io");
595594

596-
Branch.getInstance().openBrowserExperience(invokeFeatures);
595+
Branch.init().openBrowserExperience(invokeFeatures);
597596
} catch (JSONException e) {
598597
throw new RuntimeException(e);
599598
}
@@ -641,10 +640,10 @@ private static String bytesToHex(byte[] hash) {
641640
@Override
642641
protected void onStart() {
643642
super.onStart();
644-
Branch.getInstance().setIdentity("testDevID");
643+
Branch.init().setIdentity("testDevID");
645644

646-
Branch.getInstance().addFacebookPartnerParameterWithName("em", getHashedValue("[email protected]"));
647-
Branch.getInstance().addFacebookPartnerParameterWithName("ph", getHashedValue("6516006060"));
645+
Branch.init().addFacebookPartnerParameterWithName("em", getHashedValue("[email protected]"));
646+
Branch.init().addFacebookPartnerParameterWithName("ph", getHashedValue("6516006060"));
648647
Log.d("BranchSDK_Tester", "initSession");
649648

650649
//initSessionsWithTests();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Activity;
44

55
import android.os.Bundle;
6-
import android.view.KeyEvent;
76
import android.view.View;
87
import android.view.inputmethod.EditorInfo;
98
import android.view.inputmethod.InputMethodManager;
@@ -120,7 +119,7 @@ void setupDisableAdNetworkCalloutsSwitch() {
120119
disableAdNetworkCalloutsSwitch.setOnClickListener(new View.OnClickListener() {
121120
@Override
122121
public void onClick(View v) {
123-
Branch.getInstance().disableAdNetworkCallouts(disableAdNetworkCalloutsSwitch.isChecked());
122+
Branch.init().disableAdNetworkCallouts(disableAdNetworkCalloutsSwitch.isChecked());
124123
}
125124
});
126125

‎Branch-SDK/src/androidTest/java/io/branch/referral/BranchTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ protected void initBranchInstance(String branchKey) {
8585
Branch.enableLogging();
8686

8787
if (branchKey == null) {
88-
branch = Branch.getInstance();
88+
branch = Branch.init();
8989
} else {
90-
branch = Branch.getInstance();
90+
branch = Branch.init();
9191
}
92-
Assert.assertEquals(branch, Branch.getInstance());
92+
Assert.assertEquals(branch, Branch.init());
9393

9494
activityScenario = ActivityScenario.launch(MockActivity.class);
9595

0 commit comments

Comments
 (0)