Skip to content

Commit 666092e

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents 91fd68f + 4f06bbc commit 666092e

File tree

59 files changed

+1718
-1327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1718
-1327
lines changed

‎.circleci/config.yml

+133-458
Large diffs are not rendered by default.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
2323
Introduction
2424
==
2525

26-
### What's New in 10.1.1
26+
### What's New in 10.2.0
2727
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
2828

2929
### Native Applications

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
allprojects {
1919
group = 'com.salesforce.mobilesdk'
20-
version = '10.1.1'
20+
version = '10.2.0'
2121
repositories {
2222
mavenLocal()
2323
maven {

‎external/cordova/cordova.js

+22-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
under the License.
2020
*/
2121
;(function() {
22-
var PLATFORM_VERSION_BUILD_LABEL = '10.1.0';
22+
var PLATFORM_VERSION_BUILD_LABEL = '11.0.0';
2323
// file: src/scripts/require.js
2424
var require;
2525
var define;
@@ -1426,6 +1426,9 @@ module.exports = {
14261426
// TODO: Extract this as a proper plugin.
14271427
modulemapper.clobbers('cordova/plugin/android/app', 'navigator.app');
14281428

1429+
// Core Splash Screen
1430+
modulemapper.clobbers('cordova/plugin/android/splashscreen', 'navigator.splashscreen');
1431+
14291432
var APP_PLUGIN_NAME = Number(cordova.platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
14301433

14311434
// Inject a listener for the backbutton on the document.
@@ -1606,6 +1609,24 @@ module.exports = {
16061609

16071610
});
16081611

1612+
// file: ../../cordova-js-src/plugin/android/splashscreen.js
1613+
define("cordova/plugin/android/splashscreen", function(require, exports, module) {
1614+
1615+
var exec = require('cordova/exec');
1616+
1617+
var splashscreen = {
1618+
show: function () {
1619+
console.log('"navigator.splashscreen.show()" is unsupported on Android.');
1620+
},
1621+
hide: function () {
1622+
exec(null, null, 'CordovaSplashScreenPlugin', 'hide', []);
1623+
}
1624+
};
1625+
1626+
module.exports = splashscreen;
1627+
1628+
});
1629+
16091630
// file: src/common/pluginloader.js
16101631
define("cordova/pluginloader", function(require, exports, module) {
16111632

‎external/shared

Submodule shared updated 35 files

‎hybrid/HybridSampleApps/AccountEditor/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<activity android:label="@string/app_name"
2222
android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
2323
android:configChanges="orientation|keyboardHidden"
24-
android:theme="@style/Theme.AppCompat.NoActionBar"
24+
android:theme="@style/SalesforceSDK_SplashScreen"
2525
android:exported="true">
2626

2727
<intent-filter >

‎hybrid/HybridSampleApps/MobileSyncExplorerHybrid/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<activity android:label="@string/app_name"
2222
android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
2323
android:configChanges="orientation|keyboardHidden"
24-
android:theme="@style/Theme.AppCompat.NoActionBar"
24+
android:theme="@style/SalesforceSDK_SplashScreen"
2525
android:exported="true">
2626

2727
<intent-filter >

‎hybrid/HybridSampleApps/NoteSync/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<activity android:label="@string/app_name"
2222
android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
2323
android:configChanges="orientation|keyboardHidden"
24-
android:theme="@style/Theme.AppCompat.NoActionBar"
24+
android:theme="@style/SalesforceSDK_SplashScreen"
2525
android:exported="true">
2626

2727
<intent-filter >

‎libs/MobileSync/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
44
package="com.salesforce.androidsdk.mobilesync"
5-
android:versionCode="78"
6-
android:versionName="10.1.1">
5+
android:versionCode="79"
6+
android:versionName="10.2.0.dev">
77

88
<application />
99

‎libs/MobileSync/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ android {
6969

7070
ext {
7171
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
72-
PUBLISH_VERSION = '10.1.1'
72+
PUBLISH_VERSION = '10.2.0'
7373
PUBLISH_ARTIFACT_ID = 'MobileSync'
7474
}
7575

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ private static void init(Context context, Class<? extends Activity> mainActivity
6666

6767
// Upgrade to the latest version.
6868
MobileSyncUpgradeManager.getInstance().upgrade();
69+
6970
initInternal(context);
70-
EventsObservable.get().notifyEvent(EventType.AppCreateComplete);
71+
EventsObservable.get().notifyEvent(EventType.AppCreateComplete);
7172
}
7273

7374
/**

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

+4-9
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
*/
2727
package com.salesforce.androidsdk.mobilesync.app;
2828

29+
import com.salesforce.androidsdk.app.SdkVersion;
2930
import com.salesforce.androidsdk.mobilesync.util.MobileSyncLogger;
3031
import com.salesforce.androidsdk.smartstore.app.SmartStoreUpgradeManager;
3132

@@ -66,21 +67,15 @@ public void upgrade() {
6667
* Upgrades mobile sync data from existing client version to the current version.
6768
*/
6869
protected synchronized void upgradeSObject() {
69-
final String installedVersion = getInstalledSobjectVersion();
70-
if (installedVersion.equals(MobileSyncSDKManager.SDK_VERSION)) {
70+
final String installedVersionStr = getInstalledSobjectVersion();
71+
if (installedVersionStr.equals(MobileSyncSDKManager.SDK_VERSION)) {
7172
return;
7273
}
7374

7475
// Update shared preference file to reflect the latest version.
7576
writeCurVersion(MOBILE_SYNC_KEY, MobileSyncSDKManager.SDK_VERSION);
7677

77-
// If the installed version < v8.2.0, we need to delete the old layout SmartStore file.
78-
try {
79-
final String majorVersionNum = installedVersion.substring(0, 3);
80-
double installedVerDouble = Double.parseDouble(majorVersionNum);
81-
} catch (Exception e) {
82-
MobileSyncLogger.e(TAG, "Failed to parse installed version.");
83-
}
78+
// Compare SDK versions using SdkVersion class and add upgrade steps here as needed.
8479
}
8580

8681
/**

‎libs/SalesforceAnalytics/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
44
package="com.salesforce.androidsdk.analytics"
5-
android:versionCode="78"
6-
android:versionName="10.1.1">
5+
android:versionCode="79"
6+
android:versionName="10.2.0.dev">
77

88
<uses-permission android:name="android.permission.INTERNET" />
99
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

‎libs/SalesforceAnalytics/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ android {
6464

6565
ext {
6666
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
67-
PUBLISH_VERSION = '10.1.1'
67+
PUBLISH_VERSION = '10.2.0'
6868
PUBLISH_ARTIFACT_ID = 'SalesforceAnalytics'
6969
}
7070

‎libs/SalesforceHybrid/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
44
package="com.salesforce.androidsdk.hybrid"
5-
android:versionCode="78"
6-
android:versionName="10.1.1">
5+
android:versionCode="79"
6+
android:versionName="10.2.0.dev">
77

88
<application />
99
</manifest>

‎libs/SalesforceHybrid/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ apply plugin: 'com.android.library'
99

1010
dependencies {
1111
api project(':libs:MobileSync')
12-
api 'org.apache.cordova:framework:10.1.0'
12+
api 'org.apache.cordova:framework:11.0.0'
1313
api 'androidx.appcompat:appcompat:1.4.0'
1414
api 'androidx.appcompat:appcompat-resources:1.4.0'
1515
api 'androidx.webkit:webkit:1.4.0'
16+
api 'androidx.core:core-splashscreen:1.0.0-rc01'
1617
androidTestImplementation 'androidx.test:runner:1.4.0'
1718
androidTestImplementation 'androidx.test:rules:1.4.0'
1819
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -67,7 +68,7 @@ android {
6768

6869
ext {
6970
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
70-
PUBLISH_VERSION = '10.1.1'
71+
PUBLISH_VERSION = '10.2.0'
7172
PUBLISH_ARTIFACT_ID = 'SalesforceHybrid'
7273
}
7374

‎libs/SalesforceHybrid/res/values/themes.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<resources>
3+
<style name="SalesforceSDK_SplashScreen" parent="Theme.SplashScreen.IconBackground">
4+
<item name="postSplashScreenTheme">@style/Theme.AppCompat.NoActionBar</item>
5+
</style>
6+
</resources>

‎libs/SalesforceHybrid/res/xml/config.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<widget xmlns = "http://www.w3.org/ns/widgets"
33
id = "com.salesforce.androidsdk"
4-
version = "10.1.1">
4+
version = "10.2.0">
55

66
<content src="index.html" />
77

@@ -24,6 +24,7 @@
2424
<preference name="loglevel" level="DEBUG"/>
2525
<preference name="classicRender" value="true" />
2626
<preference name="AndroidXEnabled" value="true" />
27+
<preference name="AndroidInsecureFileModeEnabled" value="true" />
2728

2829
<feature name="App"><param name="android-package" value="org.apache.cordova.App"/></feature>
2930
<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

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ private static void init(Context context, Class<? extends Activity> mainActivity
8585

8686
// Upgrade to the latest version.
8787
SalesforceHybridUpgradeManager.getInstance().upgrade();
88-
initInternal(context);
88+
initInternal(context);
89+
8990
EventsObservable.get().notifyEvent(EventType.AppCreateComplete);
9091
}
9192

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

-4
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ public SalesforceWebViewClient(SalesforceWebViewEngine parentEngine) {
8080
final String extendedUserAgentString = uaStr + " Hybrid " + (origUserAgent == null ? "" : origUserAgent);
8181
webSettings.setUserAgentString(extendedUserAgentString);
8282

83-
// Configure HTML5 cache support.
8483
webSettings.setDomStorageEnabled(true);
85-
final String cachePath = SalesforceSDKManager.getInstance().getAppContext().getCacheDir().getAbsolutePath();
86-
webSettings.setAppCachePath(cachePath);
87-
webSettings.setAppCacheEnabled(true);
8884
webSettings.setAllowFileAccess(true);
8985
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
9086
}

‎libs/SalesforceReact/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
44
package="com.salesforce.androidsdk.reactnative"
5-
android:versionCode="78"
6-
android:versionName="10.1.1">
5+
android:versionCode="79"
6+
android:versionName="10.2.0.dev">
77

88
<application />
99
</manifest>

‎libs/SalesforceReact/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply plugin: 'com.android.library'
2020

2121
dependencies {
2222
api project(':libs:MobileSync')
23-
api 'com.facebook.react:react-native:0.67.1'
23+
api 'com.facebook.react:react-native:0.70.1'
2424
androidTestImplementation 'androidx.test:runner:1.4.0'
2525
androidTestImplementation 'androidx.test:rules:1.4.0'
2626
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
@@ -119,7 +119,7 @@ afterEvaluate {
119119

120120
ext {
121121
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
122-
PUBLISH_VERSION = '10.1.1'
122+
PUBLISH_VERSION = '10.2.0'
123123
PUBLISH_ARTIFACT_ID = 'SalesforceReact'
124124
}
125125

‎libs/SalesforceReact/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
{
22
"name": "SalesforceReact",
3-
"version": "10.1.1",
3+
"version": "10.2.0",
44
"private": true,
55
"scripts": {
66
"start": "node node_modules/react-native/local-cli/cli.js start"
77
},
88
"dependencies": {
99
"create-react-class": "^15.7.0",
10-
"react": "17.0.2",
11-
"react-native": "0.67.1",
12-
"react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#v10.1.1"
10+
"react": "18.1.0",
11+
"react-native": "0.70.1",
12+
"react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev"
1313
},
1414
"devDependencies": {
1515
"@babel/core": "^7.12.9",
16-
"@babel/preset-env": "^7.1.6",
1716
"@babel/runtime": "^7.12.5",
17+
"@babel/preset-env": "^7.1.6",
1818
"@react-native-community/cli": "^6.0.0",
1919
"@react-native-community/eslint-config": "^2.0.0",
2020
"@types/jest": "^26.0.18",
21-
"@types/react": "^17.0.19",
22-
"@types/react-native": "^0.66.12",
21+
"@types/react": "^18.0.20",
22+
"@types/react-native": "^0.70.1",
2323
"@types/react-test-renderer": "^17.0.1",
2424
"babel-jest": "^26.6.3",
2525
"chai": "4.2.0",
2626
"eslint": "^7.15.0",
2727
"jest": "^26.6.3",
28-
"metro-react-native-babel-preset": "^0.66.2",
28+
"metro-react-native-babel-preset": "^0.72.1",
2929
"react-native-codegen": "^0.0.7",
30-
"react-test-renderer": "17.0.2",
31-
"typescript": "^4.1.2"
30+
"react-test-renderer": "18.1.0",
31+
"typescript": "^4.8.3"
3232
}
3333
}

‎libs/SalesforceSDK/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
44
package="com.salesforce.androidsdk"
5-
android:versionCode="78"
6-
android:versionName="10.1.1">
5+
android:versionCode="79"
6+
android:versionName="10.2.0.dev">
77

88
<application>
99

‎libs/SalesforceSDK/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apply plugin: 'com.android.library'
99

1010
dependencies {
1111
api project(':libs:SalesforceAnalytics')
12-
api 'com.squareup.okhttp3:okhttp:3.12.12'
12+
api 'com.squareup.okhttp3:okhttp:4.10.0'
1313
api 'com.google.firebase:firebase-messaging:20.1.0'
1414
api 'androidx.core:core:1.7.0'
1515
api 'androidx.browser:browser:1.4.0'
@@ -70,7 +70,7 @@ android {
7070

7171
ext {
7272
PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
73-
PUBLISH_VERSION = '10.1.1'
73+
PUBLISH_VERSION = '10.2.0'
7474
PUBLISH_ARTIFACT_ID = 'SalesforceSDK'
7575
}
7676

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

+4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@
3737
* A service that publishes stored data when an intent is triggered.
3838
*
3939
* @author bhariharan
40+
*
41+
* @deprecated This class will be drastically altered or replaced in Mobile SDK 11.0 when the deprecated
42+
* {@link androidx.core.app.JobIntentService} base is replaced with a WorkManager Worker class.
4043
*/
44+
@Deprecated
4145
public class AnalyticsPublisherService extends JobIntentService {
4246

4347
private static final String ACTION_PUBLISH = "com.salesforce.androidsdk.analytics.action.ANALYTICS_PUBLISH";

0 commit comments

Comments
 (0)