From d7b822637e582a34797a8be61a63df97aabd9b12 Mon Sep 17 00:00:00 2001 From: Nipun Date: Mon, 13 Sep 2021 15:20:20 -0700 Subject: [PATCH 1/2] Removed credit methods Removed all credit methods from .js, .java, and .m files --- .../io/branch/rnbranch/RNBranchModule.java | 104 ------------------ .../src/BranchMethods.js | 37 ------- .../testbed_native_ios/src/BranchMethods.js | 37 ------- examples/testbed_simple/src/BranchMethods.js | 37 ------- ios/RNBranch.m | 66 ----------- .../ios/NativeTestsTests/RNBranchTests.m | 5 - src/BranchEvent.js | 6 - src/index.d.ts | 11 -- src/index.js | 5 - test/BranchEvent.test.js | 4 - test/RNBranchMock.js | 1 - 11 files changed, 313 deletions(-) diff --git a/android/src/main/java/io/branch/rnbranch/RNBranchModule.java b/android/src/main/java/io/branch/rnbranch/RNBranchModule.java index e4255328a..24d593fad 100644 --- a/android/src/main/java/io/branch/rnbranch/RNBranchModule.java +++ b/android/src/main/java/io/branch/rnbranch/RNBranchModule.java @@ -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"; @@ -290,7 +289,6 @@ public Map 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()); @@ -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 errors = new ArrayList(); - 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 diff --git a/examples/testbed_native_android/src/BranchMethods.js b/examples/testbed_native_android/src/BranchMethods.js index e7e89d45b..228762982 100644 --- a/examples/testbed_native_android/src/BranchMethods.js +++ b/examples/testbed_native_android/src/BranchMethods.js @@ -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 { @@ -160,10 +127,6 @@ class BranchMethods extends Component { - - - - ) diff --git a/examples/testbed_native_ios/src/BranchMethods.js b/examples/testbed_native_ios/src/BranchMethods.js index e7e89d45b..228762982 100644 --- a/examples/testbed_native_ios/src/BranchMethods.js +++ b/examples/testbed_native_ios/src/BranchMethods.js @@ -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 { @@ -160,10 +127,6 @@ class BranchMethods extends Component { - - - - ) diff --git a/examples/testbed_simple/src/BranchMethods.js b/examples/testbed_simple/src/BranchMethods.js index 8ced5a3ad..bf3f9e788 100644 --- a/examples/testbed_simple/src/BranchMethods.js +++ b/examples/testbed_simple/src/BranchMethods.js @@ -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 { @@ -274,10 +241,6 @@ class BranchMethods extends Component { - - - - diff --git a/ios/RNBranch.m b/ios/RNBranch.m index 661e4b446..9562af3be 100644 --- a/ios/RNBranch.m +++ b/ios/RNBranch.m @@ -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, @@ -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 diff --git a/native-tests/ios/NativeTestsTests/RNBranchTests.m b/native-tests/ios/NativeTestsTests/RNBranchTests.m index 0b4444751..4bf41c0af 100644 --- a/native-tests/ios/NativeTestsTests/RNBranchTests.m +++ b/native-tests/ios/NativeTestsTests/RNBranchTests.m @@ -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); diff --git a/src/BranchEvent.js b/src/BranchEvent.js index af13c3224..951a2467d 100644 --- a/src/BranchEvent.js +++ b/src/BranchEvent.js @@ -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} diff --git a/src/index.d.ts b/src/index.d.ts index fab9ed9f6..253d0e723 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -98,11 +98,6 @@ export class BranchEvent { */ static Purchase: string; - /** - * Standard Spend Credits event - */ - static SpendCredits: string; - /** * Standard View Ad event */ @@ -305,12 +300,6 @@ interface Branch { clearPartnerParameter: () => void; logout: () => void; openURL: (url: string, options?: { newActivity?: boolean }) => void; - redeemRewards: ( - amount: number, - bucket?: string - ) => Promise<{ changed: boolean }>; - loadRewards: (bucket?: string) => Promise<{ credits: number }>; - getCreditHistory: () => Promise; // TODO createBranchUniversalObject: ( identifier: string, options: BranchUniversalObjectOptions diff --git a/src/index.js b/src/index.js index 69ffd33f6..da2c3eea2 100644 --- a/src/index.js +++ b/src/index.js @@ -85,11 +85,6 @@ class Branch { })() } - /*** Referral Methods ***/ - redeemRewards = (amount, bucket) => RNBranch.redeemRewards(amount, bucket) - loadRewards = (bucket) => RNBranch.loadRewards(bucket) - getCreditHistory = RNBranch.getCreditHistory - /*** BranchUniversalObject ***/ createBranchUniversalObject = createBranchUniversalObject } diff --git a/test/BranchEvent.test.js b/test/BranchEvent.test.js index 08df6dcb4..144ad8292 100644 --- a/test/BranchEvent.test.js +++ b/test/BranchEvent.test.js @@ -28,10 +28,6 @@ test('Purchase is correct', () => { expect(BranchEvent.Purchase).toBe(RNBranch.STANDARD_EVENT_PURCHASE) }) -test('SpendCredits is correct', () => { - expect(BranchEvent.SpendCredits).toBe(RNBranch.STANDARD_EVENT_SPEND_CREDITS) -}) - test('Search is correct', () => { expect(BranchEvent.Search).toBe(RNBranch.STANDARD_EVENT_SEARCH) }) diff --git a/test/RNBranchMock.js b/test/RNBranchMock.js index 2f8983f42..f548345d4 100644 --- a/test/RNBranchMock.js +++ b/test/RNBranchMock.js @@ -11,7 +11,6 @@ NativeModules.RNBranch = { STANDARD_EVENT_INITIATE_PURCHASE: 'INITIATE_PURCHASE', STANDARD_EVENT_ADD_PAYMENT_INFO: 'ADD_PAYMENT_INFO', STANDARD_EVENT_PURCHASE: 'PURCHASE', - STANDARD_EVENT_SPEND_CREDITS: 'SPEND_CREDITS', STANDARD_EVENT_VIEW_AD: 'VIEW_AD', STANDARD_EVENT_CLICK_AD: 'CLICK_AD', From 4aeae3781911ebb7367f19422e89fbec51d717c7 Mon Sep 17 00:00:00 2001 From: Nipun Date: Mon, 27 Sep 2021 12:55:38 -0700 Subject: [PATCH 2/2] Defined missing function [INTENG-13750] Added a line to define the function under the interface --- src/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.d.ts b/src/index.d.ts index 253d0e723..316f48082 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -294,6 +294,7 @@ interface Branch { isTrackingDisabled: boolean; getLatestReferringParams: (synchronous?: boolean) => Promise; getFirstReferringParams: () => Promise; + lastAttributedTouchData: (attributionWindow?: number) => Promise; setIdentity: (identity: string) => void; setRequestMetadata: (key: string, value: string) => void; addFacebookPartnerParameter: (name: string, value: string) => void;