airbridge-react-native-sdk-restricted 4.1.6 → 4.2.0

package/qa/source/App.js

@@ -5,7 +5,7 @@ import { storage } from './common/Storage'
 import { fcmService } from './common/FCMService'
 import { NavigationContainer } from '@react-navigation/native'
 import StackNavigation from './navigations/Stack'
-import { Airbridge } from 'airbridge-react-native-sdk'
+import { Airbridge } from 'airbridge-react-native-sdk-restricted'
 
 import MessageDialog from './component/MessageDialog'
 import { qaLog } from './common/QALog'

package/qa/source/common/FCMService.js

@@ -1,9 +1,10 @@
-import { Platform } from 'react-native'
+import { Platform, NativeModules } from 'react-native'
 
 import messaging from '@react-native-firebase/messaging'
 import { Airbridge } from 'airbridge-react-native-sdk-restricted'
 
 import { storage } from './Storage'
+import { qaLog } from './QALog'
 
 class FCMService {
 
@@ -54,7 +55,7 @@ class FCMService {
     }
 
     getIosToken = async () => {
-      console.log('[App] onRegister getIosToken')
+      qaLog('[App] onRegister getIosToken')
 
       try {
         if (!messaging().isDeviceRegisteredForRemoteMessages) {
@@ -62,19 +63,48 @@ class FCMService {
         }
 
         const fcmToken = await messaging().getToken()
-        if (fcmToken != null) {
+        if (fcmToken) {
           storage.set('fcmToken', fcmToken);
         }
 
         const apnsToken = await messaging().getAPNSToken()
-        console.log('[App] apns token : ' + apnsToken)
+        qaLog('[App] getIosToken ApnsToken : ' + apnsToken)
         if (apnsToken) {
           storage.set('apnsToken', apnsToken);
           Airbridge.registerPushToken(apnsToken)
         }
       }
       catch (error) {
-        console.log('[App] ios error::', error)
+        qaLog('[App] ios error::', error)
+        this.getApnsToken()
+      }
+    }
+
+    getApnsToken = async () => {
+      qaLog('[App] onRegister getApnsToken')
+
+      let shouldStop = false
+      const repeatCount = 5
+      const freq = 500
+
+      for (let i = 0; i < repeatCount; i++) {
+        setTimeout(async () => {
+          if (shouldStop) return
+
+          try {
+            const response = await NativeModules.IdentifiersInteractor.apnsToken();
+            const jsonData = JSON.parse(response);
+            const apnsToken = jsonData['data']
+            qaLog(`[App] getApnsToken ApnsToken (${i}) : ${apnsToken}`)
+            if (apnsToken) {
+              shouldStop = true
+              storage.set('apnsToken', apnsToken);
+              Airbridge.registerPushToken(apnsToken)
+            }
+          } catch (error) {
+            
+          }
+        }, i * freq);
       }
     }
 

package/qa/source/pages/AppInfo.js

@@ -6,6 +6,7 @@ import {
   androidSDKVersion,
   iOSSDKVersion,
   reactNativeSDKVersion,
+  buildNumber,
   branchName,
   commitRev,
 } from '../common/BuildParameter.generated'

package/script/BuildQA.sh

@@ -14,12 +14,9 @@ npm run build
     cd qa
     npm clean-install
 )
-if [[ $BUILD_QA != ios ]] && [[ $BUILD_QA != android ]]; then
-    BUILD_QA=all
-fi
 
 # build ios
-if [[ $BUILD_QA == all ]] || [[ $BUILD_QA == ios ]]; then
+if [[ $BUILD_QA == ios ]]; then
     (
         cd qa/ios
         pod install
@@ -45,11 +42,11 @@ if [[ $BUILD_QA == all ]] || [[ $BUILD_QA == ios ]]; then
         -exportPath "$BUFFER_DIRECTORY/ios-application" \
         -exportOptionsPlist "$BUFFER_DIRECTORY/ios-application.plist" \
         -allowProvisioningUpdates
-    cp -r "$BUFFER_DIRECTORY/ios-application/AirbridgeQA.ipa" 'build/qa/ios-application.ipa'
+    cp -r "$BUFFER_DIRECTORY/ios-application/AirbridgeQA.ipa" "build/qa/$BUILD_OUTPUT"
 fi
 
 # build android
-if [[ $BUILD_QA == all ]] || [[ $BUILD_QA == android ]]; then
+if [[ $BUILD_QA == android ]]; then
     echo "$KEYSTORE" \
         | base64 --decode \
         > "$BUFFER_DIRECTORY/android-application.keystore"
@@ -58,7 +55,7 @@ if [[ $BUILD_QA == all ]] || [[ $BUILD_QA == android ]]; then
         cd qa/android
         ./gradlew app:assembleRelease
     )
-    cp -r 'qa/android/app/build/outputs/apk/release/app-release.apk' 'build/qa/android-application.apk'
+    cp -r 'qa/android/app/build/outputs/apk/release/app-release.apk' "build/qa/$BUILD_OUTPUT"
 fi
 
 # clean environment

package/script/ChangeRestricted.sh

@@ -23,6 +23,7 @@ perl -i -pe 's/implementation "io.airbridge:sdk-android:/implementation "io.airb
 echo 'Change qa'
 perl -i -pe 's/"airbridge-react-native-sdk"/"airbridge-react-native-sdk-restricted"/g' "$ROOT_DIRECTORY/qa/package.json"
 perl -i -pe 's/"airbridge-react-native-sdk"/"airbridge-react-native-sdk-restricted"/g' "$ROOT_DIRECTORY/qa/package-lock.json"
+perl -i -pe "s/from 'airbridge-react-native-sdk'/from 'airbridge-react-native-sdk-restricted'/g" "$ROOT_DIRECTORY/qa/source/App.js"
 perl -i -pe "s/from 'airbridge-react-native-sdk'/from 'airbridge-react-native-sdk-restricted'/g" "$ROOT_DIRECTORY"/qa/source/**/*
 perl -i -pe "s/= 'airbridge-ios-sdk'/= 'airbridge-ios-sdk-restricted'/g" "$ROOT_DIRECTORY/qa/ios/InternalLibrary/airbridge-ios-sdk.podspec"
 perl -i -pe 's/Airbridge.zip"/AirbridgeRestricted.zip"/g' "$ROOT_DIRECTORY/qa/ios/InternalLibrary/airbridge-ios-sdk.podspec"

package/source/Airbridge.ts

@@ -312,7 +312,7 @@ export class Airbridge {
      * @return `true` if the tracking feature of SDK tracking is enabled,`false` otherwise.
      */
     static isTrackingEnabled(): Promise<boolean> {
-        return this.#dependency.switchModule.isSDKEnabled()
+        return this.#dependency.switchModule.isTrackingEnabled()
     }
 
     // web interface