mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 18:28:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

baseURL might be null

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2019-09-02 15:25:30 +02:00
parent f284d3bcb6
commit 23f40b710c
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -656,7 +656,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
boolean isUrlInputAllowed = getResources().getBoolean(R.bool.show_server_url_input);
if (savedInstanceState == null) {
if (mAccount != null) {
mServerInfo.mBaseUrl = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL);
String baseUrl = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL);
if (TextUtils.isEmpty(baseUrl)) {
mServerInfo.mBaseUrl = "";
} else {
mServerInfo.mBaseUrl = baseUrl;
}
// TODO do next in a setter for mBaseUrl
mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith(HTTPS_PROTOCOL);
mServerInfo.mVersion = accountManager.getServerVersion(mAccount);

41
src/test/java/com/owncloud/android/utils/DisplayUtilsTest.java Normal file
View file

@ -0,0 +1,41 @@
/*
*
* * Nextcloud Android client application
* *
* * @author Tobias Kaminsky
* * Copyright (C) 2019 Tobias Kaminsky
* * Copyright (C) 2019 Nextcloud GmbH
* *
* * This program is free software: you can redistribute it and/or modify
* * it under the terms of the GNU Affero General Public License as published by
* * the Free Software Foundation, either version 3 of the License, or
* * (at your option) any later version.
* *
* * This program is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* * GNU Affero General Public License for more details.
* *
* * You should have received a copy of the GNU Affero General Public License
* * along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
package com.owncloud.android.utils;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class DisplayUtilsTest {
@Test
public void testConvertIdn() {
assertEquals("", DisplayUtils.convertIdn("", true));
assertEquals("", DisplayUtils.convertIdn("", false));
assertEquals("http://www.nextcloud.com", DisplayUtils.convertIdn("http://www.nextcloud.com", true));
assertEquals("http://www.xn--wlkchen-90a.com", DisplayUtils.convertIdn("http://www.wölkchen.com", true));
assertEquals("http://www.wölkchen.com", DisplayUtils.convertIdn("http://www.xn--wlkchen-90a.com", false));
}
}