Skip to content

Commit 2d527da

Browse files
JohnsonEricAtSalesforceJohnsonEricAtSalesforce
authored
@W-21148602: Internal Server List does not respect changes made to Servers.xml file (#2845)
1 parent 115372e commit 2d527da

8 files changed

Lines changed: 1924 additions & 590 deletions

File tree

‎libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java‎

Lines changed: 397 additions & 181 deletions
Large diffs are not rendered by default.

‎libs/test/SalesforceSDKTest/res/xml/servers_addition.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<servers>
3+
<server name="Production" url="https://login.salesforce.com"/>
4+
<server name="Sandbox" url="https://test.salesforce.com"/>
5+
<server name="Added" url="https://added.salesforce.com"/>
6+
<server name="Other" url="https://other.salesforce.com"/>
7+
</servers>

‎libs/test/SalesforceSDKTest/res/xml/servers_empty.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<servers />

‎libs/test/SalesforceSDKTest/res/xml/servers_nulls.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<servers>
3+
<server />
4+
<server name="Any String" />
5+
<server url="Any String" />
6+
<server
7+
name="Example Login Server"
8+
url="https://www.example.com" />
9+
</servers>

‎libs/test/SalesforceSDKTest/res/xml/servers_remove.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<servers>
3+
<server name="Production" url="https://login.salesforce.com"/>
4+
<server name="Other" url="https://other.salesforce.com"/>
5+
</servers>

‎libs/test/SalesforceSDKTest/res/xml/servers_update.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<servers>
3+
<server name="Production" url="https://login.salesforce.com"/>
4+
<server name="Updated" url="https://updated.salesforce.com"/>
5+
<server name="Sandbox" url="https://test.salesforce.com"/>
6+
<server name="Other" url="https://other.salesforce.com"/>
7+
</servers>

0 commit comments

Comments
 (0)