Skip to content

Commit f69ed47

Browse files
echo-branchecho-branch
authored
Merge pull request #672 from BranchMetrics/CORE-2358
Removed credit-related methods
2 parents 39e6198 + 4aeae37 commit f69ed47

File tree

11 files changed

+1
-313
lines changed

11 files changed

+1
-313
lines changed

‎android/src/main/java/io/branch/rnbranch/RNBranchModule.java‎

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public class RNBranchModule extends ReactContextBaseJavaModule {
5656
private static final String STANDARD_EVENT_INITIATE_PURCHASE = "STANDARD_EVENT_INITIATE_PURCHASE";
5757
private static final String STANDARD_EVENT_ADD_PAYMENT_INFO = "STANDARD_EVENT_ADD_PAYMENT_INFO";
5858
private static final String STANDARD_EVENT_PURCHASE = "STANDARD_EVENT_PURCHASE";
59-
private static final String STANDARD_EVENT_SPEND_CREDITS = "STANDARD_EVENT_SPEND_CREDITS";
6059
private static final String STANDARD_EVENT_VIEW_AD = "STANDARD_EVENT_VIEW_AD";
6160
private static final String STANDARD_EVENT_CLICK_AD = "STANDARD_EVENT_CLICK_AD";
6261

@@ -290,7 +289,6 @@ public Map<String, Object> getConstants() {
290289
constants.put(STANDARD_EVENT_INITIATE_PURCHASE, BRANCH_STANDARD_EVENT.INITIATE_PURCHASE.getName());
291290
constants.put(STANDARD_EVENT_ADD_PAYMENT_INFO, BRANCH_STANDARD_EVENT.ADD_PAYMENT_INFO.getName());
292291
constants.put(STANDARD_EVENT_PURCHASE, BRANCH_STANDARD_EVENT.PURCHASE.getName());
293-
constants.put(STANDARD_EVENT_SPEND_CREDITS, BRANCH_STANDARD_EVENT.SPEND_CREDITS.getName());
294292
constants.put(STANDARD_EVENT_VIEW_AD, BRANCH_STANDARD_EVENT.VIEW_AD.getName());
295293
constants.put(STANDARD_EVENT_CLICK_AD, BRANCH_STANDARD_EVENT.CLICK_AD.getName());
296294

@@ -976,108 +974,6 @@ public ProductCategory getProductCategory(final String stringValue) {
976974
return null;
977975
}
978976

979-
@ReactMethod
980-
public void redeemRewards(int value, String bucket, Promise promise)
981-
{
982-
if (bucket == null) {
983-
Branch.getInstance().redeemRewards(value, new RedeemRewardsListener(promise));
984-
} else {
985-
Branch.getInstance().redeemRewards(bucket, value, new RedeemRewardsListener(promise));
986-
}
987-
}
988-
989-
@ReactMethod
990-
public void loadRewards(String bucket, Promise promise)
991-
{
992-
Branch.getInstance().loadRewards(new LoadRewardsListener(bucket, promise));
993-
}
994-
995-
@ReactMethod
996-
public void getCreditHistory(Promise promise)
997-
{
998-
Branch.getInstance().getCreditHistory(new CreditHistoryListener(promise));
999-
}
1000-
1001-
protected class CreditHistoryListener implements Branch.BranchListResponseListener
1002-
{
1003-
private Promise _promise;
1004-
1005-
// Constructor that takes in a required callbackContext object
1006-
public CreditHistoryListener(Promise promise) {
1007-
this._promise = promise;
1008-
}
1009-
1010-
// Listener that implements BranchListResponseListener for getCreditHistory()
1011-
@Override
1012-
public void onReceivingResponse(JSONArray list, BranchError error) {
1013-
ArrayList<String> errors = new ArrayList<String>();
1014-
if (error == null) {
1015-
try {
1016-
ReadableArray result = convertJsonToArray(list);
1017-
this._promise.resolve(result);
1018-
} catch (JSONException err) {
1019-
this._promise.reject(GENERIC_ERROR, err.getMessage());
1020-
}
1021-
} else {
1022-
String errorMessage = error.getMessage();
1023-
Log.d(REACT_CLASS, errorMessage);
1024-
this._promise.reject(GENERIC_ERROR, errorMessage);
1025-
}
1026-
}
1027-
}
1028-
1029-
protected class RedeemRewardsListener implements Branch.BranchReferralStateChangedListener
1030-
{
1031-
private Promise _promise;
1032-
1033-
public RedeemRewardsListener(Promise promise) {
1034-
this._promise = promise;
1035-
}
1036-
1037-
@Override
1038-
public void onStateChanged(boolean changed, BranchError error) {
1039-
if (error == null) {
1040-
WritableMap map = new WritableNativeMap();
1041-
map.putBoolean("changed", changed);
1042-
this._promise.resolve(map);
1043-
} else {
1044-
String errorMessage = error.getMessage();
1045-
Log.d(REACT_CLASS, errorMessage);
1046-
this._promise.reject(GENERIC_ERROR, errorMessage);
1047-
}
1048-
}
1049-
}
1050-
1051-
protected class LoadRewardsListener implements Branch.BranchReferralStateChangedListener
1052-
{
1053-
private String _bucket;
1054-
private Promise _promise;
1055-
1056-
public LoadRewardsListener(String bucket, Promise promise) {
1057-
this._bucket = bucket;
1058-
this._promise = promise;
1059-
}
1060-
1061-
@Override
1062-
public void onStateChanged(boolean changed, BranchError error) {
1063-
if (error == null) {
1064-
int credits = 0;
1065-
if (this._bucket == null) {
1066-
credits = Branch.getInstance().getCredits();
1067-
} else {
1068-
credits = Branch.getInstance().getCreditsForBucket(this._bucket);
1069-
}
1070-
WritableMap map = new WritableNativeMap();
1071-
map.putInt("credits", credits);
1072-
this._promise.resolve(map);
1073-
} else {
1074-
String errorMessage = error.getMessage();
1075-
Log.d(REACT_CLASS, errorMessage);
1076-
this._promise.reject(GENERIC_ERROR, errorMessage);
1077-
}
1078-
}
1079-
}
1080-
1081977
public void sendRNEvent(String eventName, @Nullable WritableMap params) {
1082978
// This should avoid the crash in getJSModule() at startup
1083979
// See also: https://github.com/walmartreact/react-native-orientation-listener/issues/8

‎examples/testbed_native_android/src/BranchMethods.js‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -71,39 +71,6 @@ class BranchMethods extends Component {
7171
}
7272
}
7373

74-
redeemRewards = async (bucket) => {
75-
try {
76-
let result = await branch.redeemRewards(5, bucket)
77-
console.log('redeemRewards', result)
78-
this.addResult('success', 'redeemRewards', result)
79-
} catch (err) {
80-
console.log('redeemRewards err', {...err}, err.message, err.toString())
81-
this.addResult('error', 'redeemRewards', err.toString())
82-
}
83-
}
84-
85-
loadRewards = async() => {
86-
try {
87-
let result = await branch.loadRewards()
88-
console.log('loadRewards', result)
89-
this.addResult('success', 'loadRewards', result)
90-
} catch (err) {
91-
console.log('loadRewards err', err.toString())
92-
this.addResult('error', 'loadRewards', err.toString())
93-
}
94-
}
95-
96-
getCreditHistory = async() => {
97-
try {
98-
let result = await branch.getCreditHistory()
99-
console.log('getCreditHistory', result)
100-
this.addResult('success', 'getCreditHistory', result)
101-
} catch (err) {
102-
console.log('getCreditHistory err', err.toString())
103-
this.addResult('error', 'getCreditHistory', err.toString())
104-
}
105-
}
106-
10774
userCompletedAction = async() => {
10875
if (!this.buo) await this.createBranchUniversalObject()
10976
try {
@@ -160,10 +127,6 @@ class BranchMethods extends Component {
160127
<Button onPress={this.generateShortUrl}>generateShortUrl</Button>
161128
<Button onPress={this.listOnSpotlight}>listOnSpotlight</Button>
162129
<Button onPress={this.showShareSheet}>showShareSheet</Button>
163-
<Button onPress={this.redeemRewards.bind(this, '')}>redeemRewards</Button>
164-
<Button onPress={this.redeemRewards.bind(this, 'testBucket')}>redeemRewards (with bucket)</Button>
165-
<Button onPress={this.loadRewards}>loadRewards</Button>
166-
<Button onPress={this.getCreditHistory}>getCreditHistory</Button>
167130
</ScrollView>
168131
</View>
169132
)

‎examples/testbed_native_ios/src/BranchMethods.js‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -71,39 +71,6 @@ class BranchMethods extends Component {
7171
}
7272
}
7373

74-
redeemRewards = async (bucket) => {
75-
try {
76-
let result = await branch.redeemRewards(5, bucket)
77-
console.log('redeemRewards', result)
78-
this.addResult('success', 'redeemRewards', result)
79-
} catch (err) {
80-
console.log('redeemRewards err', {...err}, err.message, err.toString())
81-
this.addResult('error', 'redeemRewards', err.toString())
82-
}
83-
}
84-
85-
loadRewards = async() => {
86-
try {
87-
let result = await branch.loadRewards()
88-
console.log('loadRewards', result)
89-
this.addResult('success', 'loadRewards', result)
90-
} catch (err) {
91-
console.log('loadRewards err', err.toString())
92-
this.addResult('error', 'loadRewards', err.toString())
93-
}
94-
}
95-
96-
getCreditHistory = async() => {
97-
try {
98-
let result = await branch.getCreditHistory()
99-
console.log('getCreditHistory', result)
100-
this.addResult('success', 'getCreditHistory', result)
101-
} catch (err) {
102-
console.log('getCreditHistory err', err.toString())
103-
this.addResult('error', 'getCreditHistory', err.toString())
104-
}
105-
}
106-
10774
userCompletedAction = async() => {
10875
if (!this.buo) await this.createBranchUniversalObject()
10976
try {
@@ -160,10 +127,6 @@ class BranchMethods extends Component {
160127
<Button onPress={this.generateShortUrl}>generateShortUrl</Button>
161128
<Button onPress={this.listOnSpotlight}>listOnSpotlight</Button>
162129
<Button onPress={this.showShareSheet}>showShareSheet</Button>
163-
<Button onPress={this.redeemRewards.bind(this, '')}>redeemRewards</Button>
164-
<Button onPress={this.redeemRewards.bind(this, 'testBucket')}>redeemRewards (with bucket)</Button>
165-
<Button onPress={this.loadRewards}>loadRewards</Button>
166-
<Button onPress={this.getCreditHistory}>getCreditHistory</Button>
167130
</ScrollView>
168131
</View>
169132
)

‎examples/testbed_simple/src/BranchMethods.js‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -71,39 +71,6 @@ class BranchMethods extends Component {
7171
}
7272
}
7373

74-
redeemRewards = async (bucket) => {
75-
try {
76-
let result = await branch.redeemRewards(5, bucket)
77-
console.log('redeemRewards', result)
78-
this.addResult('success', 'redeemRewards', result)
79-
} catch (err) {
80-
console.log('redeemRewards err', {...err}, err.message, err.toString())
81-
this.addResult('error', 'redeemRewards', err.toString())
82-
}
83-
}
84-
85-
loadRewards = async() => {
86-
try {
87-
let result = await branch.loadRewards()
88-
console.log('loadRewards', result)
89-
this.addResult('success', 'loadRewards', result)
90-
} catch (err) {
91-
console.log('loadRewards err', err.toString())
92-
this.addResult('error', 'loadRewards', err.toString())
93-
}
94-
}
95-
96-
getCreditHistory = async() => {
97-
try {
98-
let result = await branch.getCreditHistory()
99-
console.log('getCreditHistory', result)
100-
this.addResult('success', 'getCreditHistory', result)
101-
} catch (err) {
102-
console.log('getCreditHistory err', err.toString())
103-
this.addResult('error', 'getCreditHistory', err.toString())
104-
}
105-
}
106-
10774
userCompletedAction = async() => {
10875
if (!this.buo) await this.createBranchUniversalObject()
10976
try {
@@ -274,10 +241,6 @@ class BranchMethods extends Component {
274241
<Button onPress={this.generateShortUrl}>generateShortUrl</Button>
275242
<Button onPress={this.listOnSpotlight}>listOnSpotlight</Button>
276243
<Button onPress={this.showShareSheet}>showShareSheet</Button>
277-
<Button onPress={this.redeemRewards.bind(this, '')}>redeemRewards</Button>
278-
<Button onPress={this.redeemRewards.bind(this, 'testBucket')}>redeemRewards (with bucket)</Button>
279-
<Button onPress={this.loadRewards}>loadRewards</Button>
280-
<Button onPress={this.getCreditHistory}>getCreditHistory</Button>
281244
<Button onPress={this.logStandardEvent}>BranchEvent.logEvent (Standard)</Button>
282245
<Button onPress={this.logCustomEvent}>BranchEvent.logEvent (Custom)</Button>
283246
<Button onPress={this.openURL}>openURL</Button>

‎ios/RNBranch.m‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ + (BOOL)requiresMainQueueSetup {
8383
@"STANDARD_EVENT_INITIATE_PURCHASE": BranchStandardEventInitiatePurchase,
8484
@"STANDARD_EVENT_ADD_PAYMENT_INFO": BranchStandardEventAddPaymentInfo,
8585
@"STANDARD_EVENT_PURCHASE": BranchStandardEventPurchase,
86-
@"STANDARD_EVENT_SPEND_CREDITS": BranchStandardEventSpendCredits,
8786
@"STANDARD_EVENT_VIEW_AD": BranchStandardEventViewAd,
8887
@"STANDARD_EVENT_CLICK_AD": BranchStandardEventClickAd,
8988

@@ -645,71 +644,6 @@ - (BranchUniversalObject *)findUniversalObjectWithIdent:(NSString *)ident reject
645644
}];
646645
}
647646

648-
#pragma mark loadRewards
649-
RCT_EXPORT_METHOD(
650-
loadRewards:(NSString *)bucket
651-
resolver:(RCTPromiseResolveBlock)resolve
652-
rejecter:(RCTPromiseRejectBlock)reject
653-
) {
654-
[self.class.branch loadRewardsWithCallback:^(BOOL changed, NSError *error) {
655-
if(!error) {
656-
int credits = 0;
657-
if (bucket) {
658-
credits = (int)[self.class.branch getCreditsForBucket:bucket];
659-
} else {
660-
credits = (int)[self.class.branch getCredits];
661-
}
662-
resolve(@{@"credits": @(credits)});
663-
} else {
664-
RCTLogError(@"Load Rewards Error: %@", error.localizedDescription);
665-
reject(@"RNBranch::Error::loadRewardsWithCallback", @"loadRewardsWithCallback", error);
666-
}
667-
}];
668-
}
669-
670-
#pragma mark redeemRewards
671-
RCT_EXPORT_METHOD(
672-
redeemRewards:(NSInteger)amount
673-
inBucket:(NSString *)bucket
674-
resolver:(RCTPromiseResolveBlock)resolve
675-
rejecter:(RCTPromiseRejectBlock)reject
676-
) {
677-
if (bucket) {
678-
[self.class.branch redeemRewards:amount forBucket:bucket callback:^(BOOL changed, NSError *error) {
679-
if (!error) {
680-
resolve(@{@"changed": @(changed)});
681-
} else {
682-
RCTLogError(@"Redeem Rewards Error: %@", error.localizedDescription);
683-
reject(@"RNBranch::Error::redeemRewards", error.localizedDescription, error);
684-
}
685-
}];
686-
} else {
687-
[self.class.branch redeemRewards:amount callback:^(BOOL changed, NSError *error) {
688-
if (!error) {
689-
resolve(@{@"changed": @(changed)});
690-
} else {
691-
RCTLogError(@"Redeem Rewards Error: %@", error.localizedDescription);
692-
reject(@"RNBranch::Error::redeemRewards", error.localizedDescription, error);
693-
}
694-
}];
695-
}
696-
}
697-
698-
#pragma mark getCreditHistory
699-
RCT_EXPORT_METHOD(
700-
getCreditHistory:(RCTPromiseResolveBlock)resolve
701-
rejecter:(RCTPromiseRejectBlock)reject
702-
) {
703-
[self.class.branch getCreditHistoryWithCallback:^(NSArray *list, NSError *error) {
704-
if (!error) {
705-
resolve(list);
706-
} else {
707-
RCTLogError(@"Credit History Error: %@", error.localizedDescription);
708-
reject(@"RNBranch::Error::getCreditHistory", error.localizedDescription, error);
709-
}
710-
}];
711-
}
712-
713647
#pragma mark createUniversalObject
714648
RCT_EXPORT_METHOD(
715649
createUniversalObject:(NSDictionary *)universalObjectProperties

‎native-tests/ios/NativeTestsTests/RNBranchTests.m‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ - (void)testStandardPurchaseEventConstant
7373
ASSERT_CONSTANT(@"STANDARD_EVENT_PURCHASE", BranchStandardEventPurchase);
7474
}
7575

76-
- (void)testStandardSpendCreditsEventConstant
77-
{
78-
ASSERT_CONSTANT(@"STANDARD_EVENT_SPEND_CREDITS", BranchStandardEventSpendCredits);
79-
}
80-
8176
- (void)testStandardSearchEventConstant
8277
{
8378
ASSERT_CONSTANT(@"STANDARD_EVENT_SEARCH", BranchStandardEventSearch);

‎src/BranchEvent.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,6 @@ BranchEvent.AddPaymentInfo = RNBranch.STANDARD_EVENT_ADD_PAYMENT_INFO
237237
*/
238238
BranchEvent.Purchase = RNBranch.STANDARD_EVENT_PURCHASE
239239

240-
/**
241-
* Standard Spend Credits event
242-
* @type {string}
243-
*/
244-
BranchEvent.SpendCredits = RNBranch.STANDARD_EVENT_SPEND_CREDITS
245-
246240
/**
247241
* Standard View Ad event
248242
* @type {string}

0 commit comments

Comments
 (0)