Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/SalesforceSDK/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />

<application>
<application android:supportsRtl="true">

@JohnsonEricAtSalesforce JohnsonEricAtSalesforce Feb 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, so after the Jetpack Compose migration this was actually the only task left. Note, without this the app gets into a strange state where it will use the RTL text but used the LTR layout. It looks really odd.

I reckon this will resource-merge through to the applications and in this case that means all application modules that depend on SalesforceSDK. Is that acceptable? Would we want to leave this off here and let the app modules take responsibility for adding it? Is there a case where an app module could be negatively affected? They could override as needed. I always consider that when updating a library module such as this.


<!-- Metadata for supported app restrictions -->
<meta-data android:name="android.content.APP_RESTRICTIONS"
Expand Down
1 change: 1 addition & 0 deletions libs/SalesforceSDK/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies {
api("androidx.browser:browser:1.8.0") // Update requires API 36 compileSdk

@github-actions github-actions Bot Feb 5, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ A newer version of androidx.browser:browser than 1.8.0 is available: 1.9.0

api("androidx.work:work-runtime-ktx:2.10.3")

@github-actions github-actions Bot Feb 5, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ A newer version of androidx.work:work-runtime-ktx than 2.10.3 is available: 2.11.1


implementation("com.google.accompanist:accompanist-drawablepainter:0.37.3")

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's some Google code that lets us "remember" the programmatically-derived Drawable for the app icon.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need a 3PP for this? If it is from Google maybe not?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should check. Can you direct message any instructions you have on how I can review or request that?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That 3PP is approved ✅

implementation("com.google.android.material:material:1.13.0") // remove this when all xml is gone
implementation("androidx.appcompat:appcompat:1.7.1")
implementation("androidx.biometric:biometric:1.2.0-alpha05")
Expand Down
68 changes: 0 additions & 68 deletions libs/SalesforceSDK/res/layout/sf__screen_lock.xml

This file was deleted.

7 changes: 1 addition & 6 deletions libs/SalesforceSDK/res/values/sf__dimens.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<!-- Dimensions used in sf__screen_lock.xml -->

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe these were the only orphaned dimensions after removing the XML layout.

<dimen name="sf__screenlock_error_margin_top">10dp</dimen>
<dimen name="sf__screenlock_error_margin_left">20dp</dimen>
<dimen name="sf__screenlock_error_margin_right">20dp</dimen>

<!-- Biometric Enrollment Prompt -->
<dimen name="sf__dialog_layout_padding">0dp</dimen>
</resources>
</resources>
10 changes: 0 additions & 10 deletions libs/SalesforceSDK/res/values/sf__styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,6 @@
<item name="android:windowLightStatusBar">false</item>
</style>

<style name="SalesforceSDK.ScreenLock.ErrorMessage">

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This style was also orphaned when the XML layout for screen lock was removed.

<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:layout_gravity">center_horizontal</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_marginTop">@dimen/sf__screenlock_error_margin_top</item>
<item name="android:layout_marginLeft">@dimen/sf__screenlock_error_margin_left</item>
<item name="android:layout_marginRight">@dimen/sf__screenlock_error_margin_right</item>
</style>

<style name="SalesforceSDK_Fullscreen" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ import com.salesforce.androidsdk.R
import com.salesforce.androidsdk.app.SalesforceSDKManager
import com.salesforce.androidsdk.developer.support.DevSupportInfo
import com.salesforce.androidsdk.ui.components.ICON_SIZE
import com.salesforce.androidsdk.ui.components.PADDING_SIZE
import com.salesforce.androidsdk.ui.components.TEXT_SIZE
import com.salesforce.androidsdk.ui.theme.sfDarkColors
import com.salesforce.androidsdk.ui.theme.sfLightColors
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
/*

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the copyright header here since it was missing. We do want those everywhere, correct?

* Copyright (c) 2021-present, salesforce.com, inc.
* All rights reserved.
* Redistribution and use of this software in source and binary forms, with or
* without modification, are permitted provided that the following conditions
* are met:
* - Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* - Neither the name of salesforce.com, inc. nor the names of its contributors
* may be used to endorse or promote products derived from this software without
* specific prior written permission of salesforce.com, inc.
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package com.salesforce.androidsdk.ui

import android.os.Bundle
Expand Down Expand Up @@ -55,8 +81,6 @@ import com.salesforce.androidsdk.R.string.sf__server_url_save
import com.salesforce.androidsdk.app.SalesforceSDKManager
import com.salesforce.androidsdk.config.BootConfig
import com.salesforce.androidsdk.config.OAuthConfig
import com.salesforce.androidsdk.ui.components.CORNER_RADIUS
import com.salesforce.androidsdk.ui.components.PADDING_SIZE
import com.salesforce.androidsdk.ui.components.TEXT_SIZE
import com.salesforce.androidsdk.ui.theme.hintTextColor
import com.salesforce.androidsdk.util.test.ExcludeFromJacocoGeneratedReport
Expand Down
Loading