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

Change way of checking if host url needs to be tested due to only in one case it should not be checked

Browse source
This commit is contained in:
jabarros 2016-04-25 14:04:46 +02:00
parent d78c03351f
commit 61c6393f7f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -366,7 +366,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
* @param savedInstanceState Saved activity state, as in {{@link #onCreate(Bundle)} * @param savedInstanceState Saved activity state, as in {{@link #onCreate(Bundle)}
*/ */
private void initServerPreFragment(Bundle savedInstanceState) { private void initServerPreFragment(Bundle savedInstanceState) {
boolean checkHostUrl = false; boolean checkHostUrl = true;
/// step 1 - load and process relevant inputs (resources, intent, savedInstanceState) /// step 1 - load and process relevant inputs (resources, intent, savedInstanceState)
boolean isUrlInputAllowed = getResources().getBoolean(R.bool.show_server_url_input); boolean isUrlInputAllowed = getResources().getBoolean(R.bool.show_server_url_input);
@ -409,12 +409,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
mHostUrlInput.setFocusable(false); mHostUrlInput.setFocusable(false);
} }
if (isUrlInputAllowed) { if (isUrlInputAllowed) {
if (!mServerInfo.mBaseUrl.isEmpty()) { if (mServerInfo.mBaseUrl.isEmpty()) {
checkHostUrl = true; checkHostUrl = false;
} }
mRefreshButton = findViewById(R.id.embeddedRefreshButton); mRefreshButton = findViewById(R.id.embeddedRefreshButton);
} else { } else {
checkHostUrl = true;
findViewById(R.id.hostUrlFrame).setVisibility(View.GONE); findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
mRefreshButton = findViewById(R.id.centeredRefreshButton); mRefreshButton = findViewById(R.id.centeredRefreshButton);
} }