[2.0.0 release] staging -> main

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 jobs:
   unit-test:
     docker:
-      - image: cimg/node:16.6.2
+      - image: cimg/node:19.7.0
 
     steps:
       - checkout
@@ -21,7 +21,7 @@ jobs:
 
       - run:
           name: Unit Tests
-          command: yarn tests:jest
+          command: yarn tests:jest --watchAll=false --runInBand
 
   build-sample-app-android:
     docker:
@@ -50,7 +50,9 @@ jobs:
       # CircleCI puts xcode app in consistent path, RN looks for versioned path
       - run:
           name: Move xcode
-          command: cd /Applications && mv Xcode.app Xcode-13.0.app
+          command: |
+            cd /Applications && mv Xcode.app Xcode-13.0.app
+            /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -f /Applications/Xcode-13.0.app/Contents/Developer/Applications/Simulator.app
 
       - run:
           name: Install latest NodeJS

apps/AEPSampleApp/android/app/src/main/AndroidManifest.xml

@@ -15,8 +15,10 @@
 
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.LAUNCHER" />
-        <category android:name="android.intent.category.BROWSABLE" />
 
+      </intent-filter>
+      <intent-filter>
+        <category android:name="android.intent.category.BROWSABLE" />
         <data android:scheme="assurance" />
       </intent-filter>
     </activity>

apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainActivity.java

@@ -11,6 +11,7 @@
 */
 package com.aepsampleapp;
 
+import com.adobe.marketing.mobile.MobileCore;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
@@ -35,6 +36,19 @@ protected ReactActivityDelegate createReactActivityDelegate() {
     return new MainActivityDelegate(this, getMainComponentName());
   }
 
+  @Override
+  protected void onResume() {
+    super.onResume();
+    MobileCore.setApplication(getApplication());
+    MobileCore.lifecycleStart(null);
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    MobileCore.lifecyclePause();
+  }
+
   public static class MainActivityDelegate extends ReactActivityDelegate {
     public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
       super(activity, mainComponentName);

apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java

@@ -14,23 +14,20 @@
 
 import android.app.Application;
 import android.content.Context;
-import com.adobe.marketing.mobile.AdobeCallback;
 import com.adobe.marketing.mobile.Assurance;
 import com.adobe.marketing.mobile.Edge;
-import com.adobe.marketing.mobile.InvalidInitException;
+import com.adobe.marketing.mobile.Extension;
 import com.adobe.marketing.mobile.Lifecycle;
 import com.adobe.marketing.mobile.LoggingMode;
 import com.adobe.marketing.mobile.Messaging;
 import com.adobe.marketing.mobile.MobileCore;
 import com.adobe.marketing.mobile.Signal;
 import com.adobe.marketing.mobile.UserProfile;
 import com.adobe.marketing.mobile.edge.consent.Consent;
-import com.adobe.marketing.mobile.edge.identity.Identity;
 import com.adobe.marketing.mobile.optimize.Optimize;
 import com.adobe.marketing.mobile.Places;
 import com.adobe.marketing.mobile.Target;
 import com.aepsampleapp.newarchitecture.MainApplicationReactNativeHost;
-import com.adobe.marketing.mobile.InvalidInitException;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -39,6 +36,7 @@
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication {
@@ -89,16 +87,15 @@ public void onCreate() {
   }
 
   /**
-   * Loads Flipper in React Native templates. Call this in the onCreate method
-   * with something like initializeFlipper(this,
-   * getReactNativeHost().getReactInstanceManager());
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
    * @param context
    * @param reactInstanceManager
    */
   private static void
   initializeFlipper(Context context,
-                    ReactInstanceManager reactInstanceManager) {
+      ReactInstanceManager reactInstanceManager) {
     if (BuildConfig.DEBUG) {
       try {
         /*
@@ -108,7 +105,7 @@ public void onCreate() {
         Class<?> aClass = Class.forName("com.aepsampleapp.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class,
-                       ReactInstanceManager.class)
+                ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);
       } catch (ClassNotFoundException e) {
         e.printStackTrace();
@@ -119,28 +116,21 @@ public void onCreate() {
       } catch (InvocationTargetException e) {
         e.printStackTrace();
       }
-
-      try {
-        Edge.registerExtension();
-        Identity.registerExtension();
-        Messaging.registerExtension();
-        UserProfile.registerExtension();
-        Lifecycle.registerExtension();
-        Signal.registerExtension();
-        Consent.registerExtension();
-        Assurance.registerExtension();
-        Places.registerExtension();
-        Target.registerExtension();
-        Optimize.registerExtension();
-      } catch (InvalidInitException e) {
-        e.printStackTrace();
-      }
       MobileCore.configureWithAppID("YOUR-APP-ID");
-      MobileCore.start(new AdobeCallback() {
-        @Override
-        public void call(Object o) {
-          MobileCore.lifecycleStart(null);
-        }
+      List<Class<? extends Extension>> extensions = Arrays.asList(
+          Lifecycle.EXTENSION,
+          Signal.EXTENSION,
+          Edge.EXTENSION,
+          com.adobe.marketing.mobile.edge.identity.Identity.EXTENSION,
+          Messaging.EXTENSION,
+          UserProfile.EXTENSION,
+          Assurance.EXTENSION,
+          Places.EXTENSION,
+          Target.EXTENSION,
+          Optimize.EXTENSION,
+          Consent.EXTENSION);
+      MobileCore.registerExtensions(extensions, o -> {
+        MobileCore.lifecycleStart(null);
       });
     }
   }

apps/AEPSampleApp/android/build.gradle

@@ -6,8 +6,8 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        compileSdkVersion = 33
+        targetSdkVersion = 33
 
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64
@@ -22,7 +22,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.4")
+        classpath("com.android.tools.build:gradle:7.2.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

apps/AEPSampleApp/extensions/EdgeView.tsx

@@ -19,6 +19,7 @@ import {NavigationProps} from '../types/props';
 const EdgeView = ({navigation}: NavigationProps) => {
   const [version, setVersion] = useState('');
   const [eventHandles, setEventHandles] = useState('');
+  const [locationHint, getlocationHintText] = useState('');
 
   Edge.extensionVersion().then(version => setVersion(version));
 
@@ -31,7 +32,18 @@ const EdgeView = ({navigation}: NavigationProps) => {
       let eventHandlesStr = JSON.stringify(eventHandles);
       console.log('AdobeExperienceSDK: EdgeEventHandles = ' + eventHandlesStr);
       setEventHandles(eventHandlesStr);
-    });
+    })
+  }
+
+  function getLocationHint() {
+    Edge.getLocationHint().then(hint => {
+      let locationStr = hint;
+      console.log('AdobeExperienceSDK: location hint = ' + locationStr);
+      if (hint == null) {
+       locationStr = "null";
+      }
+      getlocationHintText(locationStr);
+  })
   }
 
   return (
@@ -45,6 +57,16 @@ const EdgeView = ({navigation}: NavigationProps) => {
           onPress={() => sendEvent('datasetIdExample')}
         />
         <Text style={styles.text}>Response event handles: {eventHandles}</Text>
+        <Button
+          title="setLocationHint(va6)"
+          onPress={() => Edge.setLocationHint('va6')} 
+        />
+        <Button
+          title="setLocationHint(null))"
+          onPress={() => Edge.setLocationHint(null)} 
+        />
+        <Button title="getLocationHint()" onPress={() => getLocationHint()}  />
+        <Text style={styles.text}>Location Hint: {locationHint}</Text>
       </ScrollView>
     </View>
   );

apps/AEPSampleApp/extensions/OptimizeView.tsx

@@ -33,7 +33,6 @@ const ViewTypes = {
   content: 1,
 };
 
-const TARGET_OFFER_TYPE_TEXT = 'text/plain';
 const TARGET_OFFER_TYPE_JSON = 'application/json';
 const TARGET_OFFER_TYPE_HTML = 'text/html';
 
@@ -113,26 +112,14 @@ export default ({navigation}: any) => {
           setImageProposition(propositions.get(decisionScopeImage.getName()));
           setHtmlProposition(propositions.get(decisionScopeHtml.getName()));
           setJsonProposition(propositions.get(decisionScopeJson.getName()));
-          setTargetProposition(
-            propositions.get(decisionScopeTargetMbox.getName()),
-          );
+          setTargetProposition(propositions.get(decisionScopeTargetMbox.getName()));
         }
       },
     });
 
   const renderTargetOffer = () => {
     if (targetProposition?.items) {
-      if (targetProposition.items[0].format === TARGET_OFFER_TYPE_TEXT) {
-        return (
-          <Text
-            style={{margin: 10, fontSize: 18}}
-            onPress={() => {
-              targetProposition?.items[0].tapped(targetProposition);
-            }}>
-            {targetProposition.items[0].content}
-          </Text>
-        );
-      } else if (targetProposition.items[0].format === TARGET_OFFER_TYPE_JSON) {
+      if (targetProposition.items[0].format === TARGET_OFFER_TYPE_JSON) {
         return (
           <Text
             style={{margin: 10, fontSize: 18}}

apps/AEPSampleApp/ios/AEPSampleApp/AppDelegate.mm

@@ -73,20 +73,31 @@ - (BOOL)application:(UIApplication *)application
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
   [AEPMobileCore setLogLevel:AEPLogLevelTrace];
+  [AEPMobileCore
+      configureWithAppId:@"YOUR-APP-ID"];
+  const UIApplicationState appState = application.applicationState;
   [AEPMobileCore
       registerExtensions:@[
-        AEPMobileEdgeIdentity.class, AEPMobileEdge.class,
+        AEPMobileLifecycle.class, AEPMobileEdgeIdentity.class, AEPMobileEdge.class,
         AEPMobileEdgeConsent.class, AEPMobileMessaging.class,
         AEPMobileOptimize.class, AEPMobilePlaces.class, AEPMobileTarget.class,
-        AEPMobileCampaignClassic.class
-      ]
-              completion:^{
-                [AEPMobileCore
-                    configureWithAppId:@"YOUR-APP-ID"];
-              }];
+        AEPMobileCampaignClassic.class, AEPMobileAssurance.class
+   ] completion:^{
+      if (appState != UIApplicationStateBackground) {
+        [AEPMobileCore lifecycleStart:nil];
+      }
+   }];
   return YES;
 }
 
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    [AEPMobileCore lifecyclePause];
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+    [AEPMobileCore lifecycleStart:nil];
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
 #if DEBUG
   return

apps/AEPSampleApp/ios/Podfile

@@ -19,8 +19,6 @@ target 'AEPSampleApp' do
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  pod "AEPMessaging", :git => "https://github.com/adobe/aepsdk-messaging-ios.git", :branch => "staging"
-
   target 'AEPSampleAppTests' do
     inherit! :complete
     # Pods for testing