Merging dev into master

README.md

@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
 Introduction
 ==
 
-### What's New in 10.1.1
+### What's New in 10.2.0
 See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
 
 ### Native Applications

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 allprojects {
   group = 'com.salesforce.mobilesdk'
-  version = '10.1.1'
+  version = '10.2.0'
   repositories {
     mavenLocal()
     maven {

external/cordova/cordova.js

@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '10.1.0';
+var PLATFORM_VERSION_BUILD_LABEL = '11.0.0';
 // file: src/scripts/require.js
 var require;
 var define;
@@ -1426,6 +1426,9 @@ module.exports = {
         // TODO: Extract this as a proper plugin.
         modulemapper.clobbers('cordova/plugin/android/app', 'navigator.app');
 
+        // Core Splash Screen
+        modulemapper.clobbers('cordova/plugin/android/splashscreen', 'navigator.splashscreen');
+
         var APP_PLUGIN_NAME = Number(cordova.platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
 
         // Inject a listener for the backbutton on the document.
@@ -1606,6 +1609,24 @@ module.exports = {
 
 });
 
+// file: ../../cordova-js-src/plugin/android/splashscreen.js
+define("cordova/plugin/android/splashscreen", function(require, exports, module) {
+
+var exec = require('cordova/exec');
+
+var splashscreen = {
+    show: function () {
+        console.log('"navigator.splashscreen.show()" is unsupported on Android.');
+    },
+    hide: function () {
+        exec(null, null, 'CordovaSplashScreenPlugin', 'hide', []);
+    }
+};
+
+module.exports = splashscreen;
+
+});
+
 // file: src/common/pluginloader.js
 define("cordova/pluginloader", function(require, exports, module) {
 

hybrid/HybridSampleApps/AccountEditor/AndroidManifest.xml

@@ -21,7 +21,7 @@
         <activity android:label="@string/app_name"
             android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:theme="@style/SalesforceSDK_SplashScreen"
             android:exported="true">
 
             <intent-filter >

hybrid/HybridSampleApps/MobileSyncExplorerHybrid/AndroidManifest.xml

@@ -21,7 +21,7 @@
         <activity android:label="@string/app_name"
             android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:theme="@style/SalesforceSDK_SplashScreen"
             android:exported="true">
 
             <intent-filter >

hybrid/HybridSampleApps/NoteSync/AndroidManifest.xml

@@ -21,7 +21,7 @@
         <activity android:label="@string/app_name"
             android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:theme="@style/SalesforceSDK_SplashScreen"
             android:exported="true">
 
             <intent-filter >

libs/MobileSync/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.salesforce.androidsdk.mobilesync"
-    android:versionCode="78"
-    android:versionName="10.1.1">
+    android:versionCode="79"
+    android:versionName="10.2.0.dev">
 
     <application />
 

libs/MobileSync/build.gradle

@@ -69,7 +69,7 @@ android {
 
 ext {
     PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-    PUBLISH_VERSION = '10.1.1'
+    PUBLISH_VERSION = '10.2.0'
     PUBLISH_ARTIFACT_ID = 'MobileSync'
 }
 

libs/MobileSync/src/com/salesforce/androidsdk/mobilesync/app/MobileSyncSDKManager.java

@@ -66,8 +66,9 @@ private static void init(Context context, Class<? extends Activity> mainActivity
 
 		// Upgrade to the latest version.
 		MobileSyncUpgradeManager.getInstance().upgrade();
+
 		initInternal(context);
-        EventsObservable.get().notifyEvent(EventType.AppCreateComplete);
+		EventsObservable.get().notifyEvent(EventType.AppCreateComplete);
 	}
 
     /**

libs/MobileSync/src/com/salesforce/androidsdk/mobilesync/app/MobileSyncUpgradeManager.java

@@ -26,6 +26,7 @@
  */
 package com.salesforce.androidsdk.mobilesync.app;
 
+import com.salesforce.androidsdk.app.SdkVersion;
 import com.salesforce.androidsdk.mobilesync.util.MobileSyncLogger;
 import com.salesforce.androidsdk.smartstore.app.SmartStoreUpgradeManager;
 
@@ -66,21 +67,15 @@ public void upgrade() {
      * Upgrades mobile sync data from existing client version to the current version.
      */
     protected synchronized void upgradeSObject() {
-        final String installedVersion = getInstalledSobjectVersion();
-        if (installedVersion.equals(MobileSyncSDKManager.SDK_VERSION)) {
+        final String installedVersionStr = getInstalledSobjectVersion();
+        if (installedVersionStr.equals(MobileSyncSDKManager.SDK_VERSION)) {
             return;
         }
 
         // Update shared preference file to reflect the latest version.
         writeCurVersion(MOBILE_SYNC_KEY, MobileSyncSDKManager.SDK_VERSION);
 
-        // If the installed version < v8.2.0, we need to delete the old layout SmartStore file.
-        try {
-            final String majorVersionNum = installedVersion.substring(0, 3);
-            double installedVerDouble = Double.parseDouble(majorVersionNum);
-        } catch (Exception e) {
-            MobileSyncLogger.e(TAG, "Failed to parse installed version.");
-        }
+        // Compare SDK versions using SdkVersion class and add upgrade steps here as needed.
     }
 
     /**

libs/SalesforceAnalytics/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.salesforce.androidsdk.analytics" 
-	android:versionCode="78"
-	android:versionName="10.1.1">
+	android:versionCode="79"
+	android:versionName="10.2.0.dev">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

libs/SalesforceAnalytics/build.gradle

@@ -64,7 +64,7 @@ android {
 
 ext {
     PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-    PUBLISH_VERSION = '10.1.1'
+    PUBLISH_VERSION = '10.2.0'
     PUBLISH_ARTIFACT_ID = 'SalesforceAnalytics'
 }
 

libs/SalesforceHybrid/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.salesforce.androidsdk.hybrid"
-    android:versionCode="78"
-    android:versionName="10.1.1">
+    android:versionCode="79"
+    android:versionName="10.2.0.dev">
 
     <application />
 </manifest>

libs/SalesforceHybrid/build.gradle

@@ -9,10 +9,11 @@ apply plugin: 'com.android.library'
 
 dependencies {
   api project(':libs:MobileSync')
-  api 'org.apache.cordova:framework:10.1.0'
+  api 'org.apache.cordova:framework:11.0.0'
   api 'androidx.appcompat:appcompat:1.4.0'
   api 'androidx.appcompat:appcompat-resources:1.4.0'
   api 'androidx.webkit:webkit:1.4.0'
+  api 'androidx.core:core-splashscreen:1.0.0-rc01'
   androidTestImplementation 'androidx.test:runner:1.4.0'
   androidTestImplementation 'androidx.test:rules:1.4.0'
   androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -67,7 +68,7 @@ android {
 
 ext {
   PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-  PUBLISH_VERSION = '10.1.1'
+  PUBLISH_VERSION = '10.2.0'
   PUBLISH_ARTIFACT_ID = 'SalesforceHybrid'
 }
 

libs/SalesforceHybrid/res/values/themes.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <style name="SalesforceSDK_SplashScreen" parent="Theme.SplashScreen.IconBackground">
+        <item name="postSplashScreenTheme">@style/Theme.AppCompat.NoActionBar</item>
+    </style>
+</resources>

libs/SalesforceHybrid/res/xml/config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <widget xmlns     = "http://www.w3.org/ns/widgets"
     id        = "com.salesforce.androidsdk"
-    version   = "10.1.1">
+    version   = "10.2.0">
 
     <content src="index.html" />
 
@@ -24,6 +24,7 @@
     <preference name="loglevel" level="DEBUG"/>
     <preference name="classicRender" value="true" />
     <preference name="AndroidXEnabled" value="true" />
+    <preference name="AndroidInsecureFileModeEnabled" value="true" />
 
     <feature name="App"><param name="android-package" value="org.apache.cordova.App"/></feature>
     <feature name="com.salesforce.oauth"><param name="android-package" value="com.salesforce.androidsdk.phonegap.plugin.SalesforceOAuthPlugin"/></feature>

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/app/SalesforceHybridSDKManager.java

@@ -85,7 +85,8 @@ private static void init(Context context, Class<? extends Activity> mainActivity
 
 		// Upgrade to the latest version.
 		SalesforceHybridUpgradeManager.getInstance().upgrade();
-		initInternal(context);
+        initInternal(context);
+
         EventsObservable.get().notifyEvent(EventType.AppCreateComplete);
 	}
 

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/ui/SalesforceWebViewClient.java

@@ -80,11 +80,7 @@ public SalesforceWebViewClient(SalesforceWebViewEngine parentEngine) {
     		final String extendedUserAgentString = uaStr + " Hybrid " + (origUserAgent == null ? "" : origUserAgent);
     		webSettings.setUserAgentString(extendedUserAgentString);
 
-    		// Configure HTML5 cache support.
     		webSettings.setDomStorageEnabled(true);
-    		final String cachePath = SalesforceSDKManager.getInstance().getAppContext().getCacheDir().getAbsolutePath();
-    		webSettings.setAppCachePath(cachePath);
-    		webSettings.setAppCacheEnabled(true);
     		webSettings.setAllowFileAccess(true);
     		webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
         }

libs/SalesforceReact/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.salesforce.androidsdk.reactnative"
-    android:versionCode="78"
-    android:versionName="10.1.1">
+    android:versionCode="79"
+    android:versionName="10.2.0.dev">
 
     <application />
 </manifest>

libs/SalesforceReact/build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   api project(':libs:MobileSync')
-  api 'com.facebook.react:react-native:0.67.1'
+  api 'com.facebook.react:react-native:0.70.1'
   androidTestImplementation 'androidx.test:runner:1.4.0'
   androidTestImplementation 'androidx.test:rules:1.4.0'
   androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -119,7 +119,7 @@ afterEvaluate {
 
 ext {
     PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-    PUBLISH_VERSION = '10.1.1'
+    PUBLISH_VERSION = '10.2.0'
     PUBLISH_ARTIFACT_ID = 'SalesforceReact'
 }
 

libs/SalesforceReact/package.json

@@ -1,33 +1,33 @@
 {
     "name": "SalesforceReact",
-    "version": "10.1.1",
+    "version": "10.2.0",
     "private": true,
     "scripts": {
         "start": "node node_modules/react-native/local-cli/cli.js start"
     },
     "dependencies": {
         "create-react-class": "^15.7.0",
-        "react": "17.0.2",
-        "react-native": "0.67.1",
-        "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#v10.1.1"
+        "react": "18.1.0",
+        "react-native": "0.70.1",
+        "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev"
     },
     "devDependencies": {
         "@babel/core": "^7.12.9",
-        "@babel/preset-env": "^7.1.6",
         "@babel/runtime": "^7.12.5",
+        "@babel/preset-env": "^7.1.6",
         "@react-native-community/cli": "^6.0.0",
         "@react-native-community/eslint-config": "^2.0.0",
         "@types/jest": "^26.0.18",
-        "@types/react": "^17.0.19",
-        "@types/react-native": "^0.66.12",
+        "@types/react": "^18.0.20",
+        "@types/react-native": "^0.70.1",
         "@types/react-test-renderer": "^17.0.1",
         "babel-jest": "^26.6.3",
         "chai": "4.2.0",
         "eslint": "^7.15.0",
         "jest": "^26.6.3",
-        "metro-react-native-babel-preset": "^0.66.2",
+        "metro-react-native-babel-preset": "^0.72.1",
         "react-native-codegen": "^0.0.7",
-        "react-test-renderer": "17.0.2",
-        "typescript": "^4.1.2"
+        "react-test-renderer": "18.1.0",
+        "typescript": "^4.8.3"
     }
 }

libs/SalesforceSDK/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.salesforce.androidsdk" 
-	android:versionCode="78"
-	android:versionName="10.1.1">
+	android:versionCode="79"
+	android:versionName="10.2.0.dev">
 
     <application>
 

libs/SalesforceSDK/build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     api project(':libs:SalesforceAnalytics')
-    api 'com.squareup.okhttp3:okhttp:3.12.12'
+    api 'com.squareup.okhttp3:okhttp:4.10.0'
     api 'com.google.firebase:firebase-messaging:20.1.0'
     api 'androidx.core:core:1.7.0'
     api 'androidx.browser:browser:1.4.0'
@@ -70,7 +70,7 @@ android {
 
 ext {
     PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-    PUBLISH_VERSION = '10.1.1'
+    PUBLISH_VERSION = '10.2.0'
     PUBLISH_ARTIFACT_ID = 'SalesforceSDK'
 }
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/analytics/AnalyticsPublisherService.java

@@ -37,7 +37,11 @@
  * A service that publishes stored data when an intent is triggered.
  *
  * @author bhariharan
+ *
+ * @deprecated This class will be drastically altered or replaced in Mobile SDK 11.0 when the deprecated
+ * {@link androidx.core.app.JobIntentService} base is replaced with a WorkManager Worker class.
  */
+@Deprecated
 public class AnalyticsPublisherService extends JobIntentService {
 
     private static final String ACTION_PUBLISH = "com.salesforce.androidsdk.analytics.action.ANALYTICS_PUBLISH";