Skip to content

Commit

Permalink
Merge pull request #672 from BranchMetrics/CORE-2358
Browse files Browse the repository at this point in the history 
Removed credit-related methods
  • Loading branch information
@echo-branch
echo-branch authored Oct 1, 2021
2 parents 39e6198 + 4aeae37 commit f69ed47
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 313 deletions.
104 changes: 0 additions & 104 deletions android/src/main/java/io/branch/rnbranch/RNBranchModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public class RNBranchModule extends ReactContextBaseJavaModule {
private static final String STANDARD_EVENT_INITIATE_PURCHASE = "STANDARD_EVENT_INITIATE_PURCHASE";
private static final String STANDARD_EVENT_ADD_PAYMENT_INFO = "STANDARD_EVENT_ADD_PAYMENT_INFO";
private static final String STANDARD_EVENT_PURCHASE = "STANDARD_EVENT_PURCHASE";
private static final String STANDARD_EVENT_SPEND_CREDITS = "STANDARD_EVENT_SPEND_CREDITS";
private static final String STANDARD_EVENT_VIEW_AD = "STANDARD_EVENT_VIEW_AD";
private static final String STANDARD_EVENT_CLICK_AD = "STANDARD_EVENT_CLICK_AD";

Expand Down Expand Up @@ -290,7 +289,6 @@ public Map<String, Object> getConstants() {
constants.put(STANDARD_EVENT_INITIATE_PURCHASE, BRANCH_STANDARD_EVENT.INITIATE_PURCHASE.getName());
constants.put(STANDARD_EVENT_ADD_PAYMENT_INFO, BRANCH_STANDARD_EVENT.ADD_PAYMENT_INFO.getName());
constants.put(STANDARD_EVENT_PURCHASE, BRANCH_STANDARD_EVENT.PURCHASE.getName());
constants.put(STANDARD_EVENT_SPEND_CREDITS, BRANCH_STANDARD_EVENT.SPEND_CREDITS.getName());
constants.put(STANDARD_EVENT_VIEW_AD, BRANCH_STANDARD_EVENT.VIEW_AD.getName());
constants.put(STANDARD_EVENT_CLICK_AD, BRANCH_STANDARD_EVENT.CLICK_AD.getName());

Expand Down Expand Up @@ -976,108 +974,6 @@ public ProductCategory getProductCategory(final String stringValue) {
return null;
}

@ReactMethod
public void redeemRewards(int value, String bucket, Promise promise)
{
if (bucket == null) {
Branch.getInstance().redeemRewards(value, new RedeemRewardsListener(promise));
} else {
Branch.getInstance().redeemRewards(bucket, value, new RedeemRewardsListener(promise));
}
}

@ReactMethod
public void loadRewards(String bucket, Promise promise)
{
Branch.getInstance().loadRewards(new LoadRewardsListener(bucket, promise));
}

@ReactMethod
public void getCreditHistory(Promise promise)
{
Branch.getInstance().getCreditHistory(new CreditHistoryListener(promise));
}

protected class CreditHistoryListener implements Branch.BranchListResponseListener
{
private Promise _promise;

// Constructor that takes in a required callbackContext object
public CreditHistoryListener(Promise promise) {
this._promise = promise;
}

// Listener that implements BranchListResponseListener for getCreditHistory()
@Override
public void onReceivingResponse(JSONArray list, BranchError error) {
ArrayList<String> errors = new ArrayList<String>();
if (error == null) {
try {
ReadableArray result = convertJsonToArray(list);
this._promise.resolve(result);
} catch (JSONException err) {
this._promise.reject(GENERIC_ERROR, err.getMessage());
}
} else {
String errorMessage = error.getMessage();
Log.d(REACT_CLASS, errorMessage);
this._promise.reject(GENERIC_ERROR, errorMessage);
}
}
}

protected class RedeemRewardsListener implements Branch.BranchReferralStateChangedListener
{
private Promise _promise;

public RedeemRewardsListener(Promise promise) {
this._promise = promise;
}

@Override
public void onStateChanged(boolean changed, BranchError error) {
if (error == null) {
WritableMap map = new WritableNativeMap();
map.putBoolean("changed", changed);
this._promise.resolve(map);
} else {
String errorMessage = error.getMessage();
Log.d(REACT_CLASS, errorMessage);
this._promise.reject(GENERIC_ERROR, errorMessage);
}
}
}

protected class LoadRewardsListener implements Branch.BranchReferralStateChangedListener
{
private String _bucket;
private Promise _promise;

public LoadRewardsListener(String bucket, Promise promise) {
this._bucket = bucket;
this._promise = promise;
}

@Override
public void onStateChanged(boolean changed, BranchError error) {
if (error == null) {
int credits = 0;
if (this._bucket == null) {
credits = Branch.getInstance().getCredits();
} else {
credits = Branch.getInstance().getCreditsForBucket(this._bucket);
}
WritableMap map = new WritableNativeMap();
map.putInt("credits", credits);
this._promise.resolve(map);
} else {
String errorMessage = error.getMessage();
Log.d(REACT_CLASS, errorMessage);
this._promise.reject(GENERIC_ERROR, errorMessage);
}
}
}

public void sendRNEvent(String eventName, @Nullable WritableMap params) {
// This should avoid the crash in getJSModule() at startup
// See also: https://github.com/walmartreact/react-native-orientation-listener/issues/8
Expand Down
37 changes: 0 additions & 37 deletions examples/testbed_native_android/src/BranchMethods.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,39 +71,6 @@ class BranchMethods extends Component {
}
}

redeemRewards = async (bucket) => {
try {
let result = await branch.redeemRewards(5, bucket)
console.log('redeemRewards', result)
this.addResult('success', 'redeemRewards', result)
} catch (err) {
console.log('redeemRewards err', {...err}, err.message, err.toString())
this.addResult('error', 'redeemRewards', err.toString())
}
}

loadRewards = async() => {
try {
let result = await branch.loadRewards()
console.log('loadRewards', result)
this.addResult('success', 'loadRewards', result)
} catch (err) {
console.log('loadRewards err', err.toString())
this.addResult('error', 'loadRewards', err.toString())
}
}

getCreditHistory = async() => {
try {
let result = await branch.getCreditHistory()
console.log('getCreditHistory', result)
this.addResult('success', 'getCreditHistory', result)
} catch (err) {
console.log('getCreditHistory err', err.toString())
this.addResult('error', 'getCreditHistory', err.toString())
}
}

userCompletedAction = async() => {
if (!this.buo) await this.createBranchUniversalObject()
try {
Expand Down Expand Up @@ -160,10 +127,6 @@ class BranchMethods extends Component {
<Button onPress={this.generateShortUrl}>generateShortUrl</Button>
<Button onPress={this.listOnSpotlight}>listOnSpotlight</Button>
<Button onPress={this.showShareSheet}>showShareSheet</Button>
<Button onPress={this.redeemRewards.bind(this, '')}>redeemRewards</Button>
<Button onPress={this.redeemRewards.bind(this, 'testBucket')}>redeemRewards (with bucket)</Button>
<Button onPress={this.loadRewards}>loadRewards</Button>
<Button onPress={this.getCreditHistory}>getCreditHistory</Button>
</ScrollView>
</View>
)
Expand Down
37 changes: 0 additions & 37 deletions examples/testbed_native_ios/src/BranchMethods.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,39 +71,6 @@ class BranchMethods extends Component {
}
}

redeemRewards = async (bucket) => {
try {
let result = await branch.redeemRewards(5, bucket)
console.log('redeemRewards', result)
this.addResult('success', 'redeemRewards', result)
} catch (err) {
console.log('redeemRewards err', {...err}, err.message, err.toString())
this.addResult('error', 'redeemRewards', err.toString())
}
}

loadRewards = async() => {
try {
let result = await branch.loadRewards()
console.log('loadRewards', result)
this.addResult('success', 'loadRewards', result)
} catch (err) {
console.log('loadRewards err', err.toString())
this.addResult('error', 'loadRewards', err.toString())
}
}

getCreditHistory = async() => {
try {
let result = await branch.getCreditHistory()
console.log('getCreditHistory', result)
this.addResult('success', 'getCreditHistory', result)
} catch (err) {
console.log('getCreditHistory err', err.toString())
this.addResult('error', 'getCreditHistory', err.toString())
}
}

userCompletedAction = async() => {
if (!this.buo) await this.createBranchUniversalObject()
try {
Expand Down Expand Up @@ -160,10 +127,6 @@ class BranchMethods extends Component {
<Button onPress={this.generateShortUrl}>generateShortUrl</Button>
<Button onPress={this.listOnSpotlight}>listOnSpotlight</Button>
<Button onPress={this.showShareSheet}>showShareSheet</Button>
<Button onPress={this.redeemRewards.bind(this, '')}>redeemRewards</Button>
<Button onPress={this.redeemRewards.bind(this, 'testBucket')}>redeemRewards (with bucket)</Button>
<Button onPress={this.loadRewards}>loadRewards</Button>
<Button onPress={this.getCreditHistory}>getCreditHistory</Button>
</ScrollView>
</View>
)
Expand Down
37 changes: 0 additions & 37 deletions examples/testbed_simple/src/BranchMethods.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,39 +71,6 @@ class BranchMethods extends Component {
}
}

redeemRewards = async (bucket) => {
try {
let result = await branch.redeemRewards(5, bucket)
console.log('redeemRewards', result)
this.addResult('success', 'redeemRewards', result)
} catch (err) {
console.log('redeemRewards err', {...err}, err.message, err.toString())
this.addResult('error', 'redeemRewards', err.toString())
}
}

loadRewards = async() => {
try {
let result = await branch.loadRewards()
console.log('loadRewards', result)
this.addResult('success', 'loadRewards', result)
} catch (err) {
console.log('loadRewards err', err.toString())
this.addResult('error', 'loadRewards', err.toString())
}
}

getCreditHistory = async() => {
try {
let result = await branch.getCreditHistory()
console.log('getCreditHistory', result)
this.addResult('success', 'getCreditHistory', result)
} catch (err) {
console.log('getCreditHistory err', err.toString())
this.addResult('error', 'getCreditHistory', err.toString())
}
}

userCompletedAction = async() => {
if (!this.buo) await this.createBranchUniversalObject()
try {
Expand Down Expand Up @@ -274,10 +241,6 @@ class BranchMethods extends Component {
<Button onPress={this.generateShortUrl}>generateShortUrl</Button>
<Button onPress={this.listOnSpotlight}>listOnSpotlight</Button>
<Button onPress={this.showShareSheet}>showShareSheet</Button>
<Button onPress={this.redeemRewards.bind(this, '')}>redeemRewards</Button>
<Button onPress={this.redeemRewards.bind(this, 'testBucket')}>redeemRewards (with bucket)</Button>
<Button onPress={this.loadRewards}>loadRewards</Button>
<Button onPress={this.getCreditHistory}>getCreditHistory</Button>
<Button onPress={this.logStandardEvent}>BranchEvent.logEvent (Standard)</Button>
<Button onPress={this.logCustomEvent}>BranchEvent.logEvent (Custom)</Button>
<Button onPress={this.openURL}>openURL</Button>
Expand Down
66 changes: 0 additions & 66 deletions ios/RNBranch.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ + (BOOL)requiresMainQueueSetup {
@"STANDARD_EVENT_INITIATE_PURCHASE": BranchStandardEventInitiatePurchase,
@"STANDARD_EVENT_ADD_PAYMENT_INFO": BranchStandardEventAddPaymentInfo,
@"STANDARD_EVENT_PURCHASE": BranchStandardEventPurchase,
@"STANDARD_EVENT_SPEND_CREDITS": BranchStandardEventSpendCredits,
@"STANDARD_EVENT_VIEW_AD": BranchStandardEventViewAd,
@"STANDARD_EVENT_CLICK_AD": BranchStandardEventClickAd,

Expand Down Expand Up @@ -645,71 +644,6 @@ - (BranchUniversalObject *)findUniversalObjectWithIdent:(NSString *)ident reject
}];
}

#pragma mark loadRewards
RCT_EXPORT_METHOD(
loadRewards:(NSString *)bucket
resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject
) {
[self.class.branch loadRewardsWithCallback:^(BOOL changed, NSError *error) {
if(!error) {
int credits = 0;
if (bucket) {
credits = (int)[self.class.branch getCreditsForBucket:bucket];
} else {
credits = (int)[self.class.branch getCredits];
}
resolve(@{@"credits": @(credits)});
} else {
RCTLogError(@"Load Rewards Error: %@", error.localizedDescription);
reject(@"RNBranch::Error::loadRewardsWithCallback", @"loadRewardsWithCallback", error);
}
}];
}

#pragma mark redeemRewards
RCT_EXPORT_METHOD(
redeemRewards:(NSInteger)amount
inBucket:(NSString *)bucket
resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject
) {
if (bucket) {
[self.class.branch redeemRewards:amount forBucket:bucket callback:^(BOOL changed, NSError *error) {
if (!error) {
resolve(@{@"changed": @(changed)});
} else {
RCTLogError(@"Redeem Rewards Error: %@", error.localizedDescription);
reject(@"RNBranch::Error::redeemRewards", error.localizedDescription, error);
}
}];
} else {
[self.class.branch redeemRewards:amount callback:^(BOOL changed, NSError *error) {
if (!error) {
resolve(@{@"changed": @(changed)});
} else {
RCTLogError(@"Redeem Rewards Error: %@", error.localizedDescription);
reject(@"RNBranch::Error::redeemRewards", error.localizedDescription, error);
}
}];
}
}

#pragma mark getCreditHistory
RCT_EXPORT_METHOD(
getCreditHistory:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject
) {
[self.class.branch getCreditHistoryWithCallback:^(NSArray *list, NSError *error) {
if (!error) {
resolve(list);
} else {
RCTLogError(@"Credit History Error: %@", error.localizedDescription);
reject(@"RNBranch::Error::getCreditHistory", error.localizedDescription, error);
}
}];
}

#pragma mark createUniversalObject
RCT_EXPORT_METHOD(
createUniversalObject:(NSDictionary *)universalObjectProperties
Expand Down
5 changes: 0 additions & 5 deletions native-tests/ios/NativeTestsTests/RNBranchTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ - (void)testStandardPurchaseEventConstant
ASSERT_CONSTANT(@"STANDARD_EVENT_PURCHASE", BranchStandardEventPurchase);
}

- (void)testStandardSpendCreditsEventConstant
{
ASSERT_CONSTANT(@"STANDARD_EVENT_SPEND_CREDITS", BranchStandardEventSpendCredits);
}

- (void)testStandardSearchEventConstant
{
ASSERT_CONSTANT(@"STANDARD_EVENT_SEARCH", BranchStandardEventSearch);
Expand Down
6 changes: 0 additions & 6 deletions src/BranchEvent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,6 @@ BranchEvent.AddPaymentInfo = RNBranch.STANDARD_EVENT_ADD_PAYMENT_INFO
*/
BranchEvent.Purchase = RNBranch.STANDARD_EVENT_PURCHASE

/**
* Standard Spend Credits event
* @type {string}
*/
BranchEvent.SpendCredits = RNBranch.STANDARD_EVENT_SPEND_CREDITS

/**
* Standard View Ad event
* @type {string}
Expand Down
Loading

0 comments on commit f69ed47

Please sign in to comment.