Skip to content

Commit ef91e91

Browse files
wmathurinwmathurin
committed
Merging dev into master
2 parents 9dd18af + 2407c1a commit ef91e91

File tree

27 files changed

+66
-137
lines changed

27 files changed

+66
-137
lines changed

‎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 12.1.0
26+
### What's New in 12.2.0
2727
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
2828

2929
### Native Applications

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818

1919
allprojects {
2020
group = "com.salesforce.mobilesdk"
21-
version = "12.1.0"
21+
version = "12.2.0"
2222

2323
// Ensure that we do not use newer language features that would make the SDK incompatible with
2424
// apps that do not target the latest version of Kotlin.

‎external/shared

Submodule shared updated 34 files

‎libs/MobileSync/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="85"
5-
android:versionName="12.1.0">
4+
android:versionCode="86"
5+
android:versionName="12.2.0.dev">
66

77
<application />
88

‎libs/MobileSync/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "MobileSync"
66

77
plugins {

‎libs/SalesforceAnalytics/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="85"
5-
android:versionName="12.1.0">
4+
android:versionCode="86"
5+
android:versionName="12.2.0.dev">
66

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

‎libs/SalesforceAnalytics/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceAnalytics"
66

77
plugins {

‎libs/SalesforceHybrid/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="85"
5-
android:versionName="12.1.0">
4+
android:versionCode="86"
5+
android:versionName="12.2.0.dev">
66

77
<application>
88
<activity android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"

‎libs/SalesforceHybrid/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceHybrid"
66

77
plugins {

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

+1-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 = "12.1.0">
4+
version = "12.2.0">
55

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

‎libs/SalesforceReact/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="85"
5-
android:versionName="12.1.0">
4+
android:versionCode="86"
5+
android:versionName="12.2.0.dev">
66

77
<application>
88
<activity android:name=".ui.SalesforceReactActivity"

‎libs/SalesforceReact/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
1212
val useIntlJsc = false
1313

1414
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
15-
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
15+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
1616
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceReact"
1717

1818
plugins {

‎libs/SalesforceReact/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SalesforceReact",
3-
"version": "12.1.0",
3+
"version": "12.2.0",
44
"private": true,
55
"scripts": {
66
"start": "node node_modules/react-native/local-cli/cli.js start"
@@ -10,7 +10,7 @@
1010
"create-react-class": "^15.7.0",
1111
"react": "18.2.0",
1212
"react-native": "0.74.3",
13-
"react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#v12.1.0"
13+
"react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev"
1414
},
1515
"devDependencies": {
1616
"@babel/core": "^7.20.0",

‎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
xmlns:tools="http://schemas.android.com/tools"
5-
android:versionCode="85"
6-
android:versionName="12.1.0">
5+
android:versionCode="86"
6+
android:versionName="12.2.0.dev">
77

88
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
99
<uses-permission android:name="android.permission.USE_CREDENTIALS" />

‎libs/SalesforceSDK/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SalesforceSDK"
66

77
plugins {
@@ -22,7 +22,7 @@ dependencies {
2222
implementation("androidx.biometric:biometric:1.2.0-alpha05")
2323
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
2424
implementation("androidx.core:core-ktx:1.13.1")
25-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2")
25+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4")
2626
implementation("androidx.window:window:1.3.0")
2727
implementation("androidx.window:window-core:1.3.0")
2828
androidTestImplementation("androidx.test:runner:1.6.0")

‎libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ open class SalesforceSDKManager protected constructor(
15141514
protected var INSTANCE: SalesforceSDKManager? = null
15151515

15161516
/** The current version of this SDK */
1517-
const val SDK_VERSION = "12.1.0"
1517+
const val SDK_VERSION = "12.2.0.dev"
15181518

15191519
/**
15201520
* An intent action meant for instances of Salesforce SDK manager

‎libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/HttpAccess.java

+25-23
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public class HttpAccess {
5858

5959
private String userAgent;
6060
private OkHttpClient okHttpClient;
61-
private OkHttpClient.Builder okHttpBuilder;
62-
private OkHttpClient.Builder unauthenticatedOkHttpBuilder;
6361

6462
// Connection manager.
6563
private final ConnectivityManager conMgr;
@@ -100,26 +98,41 @@ public HttpAccess(Context app, String userAgent) {
10098
*
10199
* @return okHttpClient.Builder with appropriate connection spec
102100
* and user agent interceptor for an authenticated client.
101+
*
102+
* @deprecated To be removed in 14.0. Please use {@link #createNewClientBuilder()} instead.
103103
*/
104+
@Deprecated
104105
public OkHttpClient.Builder getOkHttpClientBuilder() {
105-
if (okHttpBuilder == null) {
106-
okHttpBuilder = createNewClientBuilder();
107-
}
108-
109-
return okHttpBuilder;
106+
return createNewClientBuilder();
110107
}
111108

112109
/**
113110
*
114111
* @return okHttpClient.Builder with appropriate connection spec
115112
* and user agent interceptor for an unauthenticated client.
113+
*
114+
* @deprecated To be removed in 14.0. Please use {@link #createNewClientBuilder()} instead.
116115
*/
116+
@Deprecated
117117
public OkHttpClient.Builder getUnauthenticatedOkHttpBuilder() {
118-
if (unauthenticatedOkHttpBuilder == null) {
119-
unauthenticatedOkHttpBuilder = createNewClientBuilder();
120-
}
118+
return createNewClientBuilder();
119+
}
121120

122-
return unauthenticatedOkHttpBuilder;
121+
/**
122+
* Creates a new OkHttp Client Builder with appropriate connection spec
123+
* and user agent interceptor.
124+
*
125+
* @return the okHttpClient.Builder
126+
*/
127+
public OkHttpClient.Builder createNewClientBuilder() {
128+
ConnectionSpec connectionSpec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
129+
.tlsVersions(TlsVersion.TLS_1_1, TlsVersion.TLS_1_2)
130+
.build();
131+
return new OkHttpClient.Builder()
132+
.connectionSpecs(Collections.singletonList(connectionSpec))
133+
.connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
134+
.readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
135+
.addNetworkInterceptor(new UserAgentInterceptor());
123136
}
124137

125138
/**
@@ -128,7 +141,7 @@ public OkHttpClient.Builder getUnauthenticatedOkHttpBuilder() {
128141
*/
129142
public synchronized OkHttpClient getOkHttpClient() {
130143
if (okHttpClient == null) {
131-
okHttpClient = getOkHttpClientBuilder().build();
144+
okHttpClient = createNewClientBuilder().build();
132145
}
133146
return okHttpClient;
134147
}
@@ -158,17 +171,6 @@ public String getUserAgent() {
158171
return userAgent;
159172
}
160173

161-
private OkHttpClient.Builder createNewClientBuilder() {
162-
ConnectionSpec connectionSpec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
163-
.tlsVersions(TlsVersion.TLS_1_1, TlsVersion.TLS_1_2)
164-
.build();
165-
return new OkHttpClient.Builder()
166-
.connectionSpecs(Collections.singletonList(connectionSpec))
167-
.connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
168-
.readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
169-
.addNetworkInterceptor(new UserAgentInterceptor());
170-
}
171-
172174
/**
173175
* Exception thrown if the device is offline, during an attempted HTTP call.
174176
*/

‎libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/RestClient.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,9 @@ private synchronized void setOkHttpClientBuilder() {
204204

205205
// If none cached, create new one
206206
if (okHttpClientBuilder == null) {
207-
if (cacheKey.equals("unauthenticated")) {
208-
okHttpClientBuilder = httpAccessor.getUnauthenticatedOkHttpBuilder();
209-
} else {
210-
okHttpClientBuilder = httpAccessor.getOkHttpClientBuilder()
211-
.addInterceptor(getOAuthRefreshInterceptor());
207+
okHttpClientBuilder = httpAccessor.createNewClientBuilder();
208+
if (!cacheKey.equals("unauthenticated")) {
209+
okHttpClientBuilder.addInterceptor(getOAuthRefreshInterceptor());
212210
}
213211

214212
OK_CLIENT_BUILDERS.put(getCacheKey(), okHttpClientBuilder);

‎libs/SmartStore/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="85"
5-
android:versionName="12.1.0">
4+
android:versionCode="86"
5+
android:versionName="12.2.0.dev">
66

77
<application>
88

‎libs/SmartStore/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
rootProject.ext["PUBLISH_GROUP_ID"] = "com.salesforce.mobilesdk"
4-
rootProject.ext["PUBLISH_VERSION"] = "12.1.0"
4+
rootProject.ext["PUBLISH_VERSION"] = "12.2.0"
55
rootProject.ext["PUBLISH_ARTIFACT_ID"] = "SmartStore"
66

77
plugins {
@@ -15,7 +15,7 @@ dependencies {
1515
api(project(":libs:SalesforceSDK"))
1616
//noinspection GradleDependency - Needs to line up with supported SQLCipher version.
1717
api("androidx.sqlite:sqlite:2.2.0")
18-
api("net.zetetic:sqlcipher-android:4.6.0")
18+
api("net.zetetic:sqlcipher-android:4.6.1")
1919
implementation("androidx.core:core-ktx:1.13.1")
2020
androidTestImplementation("androidx.test:runner:1.6.0")
2121
androidTestImplementation("androidx.test:rules:1.6.0")

‎libs/test/SalesforceHybridTest/res/xml/config.xml

+1-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 = "12.1.0">
4+
version = "12.2.0">
55

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

‎libs/test/SmartStoreTest/src/com/salesforce/androidsdk/smartstore/store/SmartStoreTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void testRuntimeSettings() {
116116
*/
117117
@Test
118118
public void testSQLCipherVersion() {
119-
Assert.assertEquals("Wrong sqlcipher version", "4.6.0 community", store.getSQLCipherVersion());
119+
Assert.assertEquals("Wrong sqlcipher version", "4.6.1 community", store.getSQLCipherVersion());
120120
}
121121

122122
/**

‎native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/ExplorerActivity.java

-12
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public class ExplorerActivity extends SalesforceActivity {
8585
private RestClient client;
8686
private TextView resultText;
8787
private TabHost tabHost;
88-
private LogoutDialogFragment logoutConfirmationDialog;
8988

9089
// Use for objectId fields auto-complete.
9190
private TreeSet<String> knownIds = new TreeSet<String>();
@@ -129,8 +128,6 @@ protected void onCreate(Bundle savedInstanceState) {
129128
// Makes the result area scrollable.
130129
resultText = (TextView) findViewById(R.id.result_text);
131130
resultText.setMovementMethod(new ScrollingMovementMethod());
132-
logoutConfirmationDialog = new LogoutDialogFragment();
133-
134131
((RestExplorerApp.RestExplorerSDKManager) RestExplorerApp.RestExplorerSDKManager.getInstance())
135132
.addDevAction(this, "Export Credentials to Clipboard", this::exportCredentials);
136133
}
@@ -140,15 +137,6 @@ public void onResume(RestClient client) {
140137
this.client = client;
141138
}
142139

143-
/**
144-
* Returns the logout dialog fragment (used mainly by tests).
145-
*
146-
* @return Logout dialog fragment.
147-
*/
148-
public LogoutDialogFragment getLogoutConfirmationDialog() {
149-
return logoutConfirmationDialog;
150-
}
151-
152140
private void addTab(String tag, int titleId, int tabId) {
153141
tabHost.addTab(tabHost.newTabSpec(tag).setIndicator(getString(titleId))
154142
.setContent(tabId));

0 commit comments

Comments
 (0)