mdm only needs to provide server address

fallback to normal login Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
nextcloud · Aug 19, 2024 · af9a63a · af9a63a
1 parent 08afce2
commit af9a63a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.idea/inspectionProfiles/ktlint.xml b/.idea/inspectionProfiles/ktlint.xml
diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -317,22 +317,26 @@ protected void onCreate(Bundle savedInstanceState) {
  mIsFirstAuthAttempt = savedInstanceState.getBoolean(KEY_AUTH_IS_FIRST_ATTEMPT_TAG);
  }
 
- boolean webViewLoginMethod;
+ boolean webViewLoginMethod = false;
  String webloginUrl = null;
 
  if (MainApp.isClientBrandedPlus()) {
  RestrictionsManager restrictionsManager = (RestrictionsManager) getSystemService(Context.RESTRICTIONS_SERVICE);
  AppConfigManager appConfigManager = new AppConfigManager(this, restrictionsManager.getApplicationRestrictions());
- webloginUrl = appConfigManager.getBaseUrl(MainApp.isClientBrandedPlus());
+
+ if (!TextUtils.isEmpty(appConfigManager.getBaseUrl(MainApp.isClientBrandedPlus()))) {
+ webloginUrl = appConfigManager.getBaseUrl(MainApp.isClientBrandedPlus()) + WEB_LOGIN;
+ }
  }
 
- if (webloginUrl != null) {
+ if (!TextUtils.isEmpty(webloginUrl)) {
  webViewLoginMethod = true;
  } else if (getIntent().getBooleanExtra(EXTRA_USE_PROVIDER_AS_WEBLOGIN, false)) {
  webViewLoginMethod = true;
  webloginUrl = getString(R.string.provider_registration_server);
- } else {
- webViewLoginMethod = !TextUtils.isEmpty(getResources().getString(R.string.webview_login_url));
+ } else if (!TextUtils.isEmpty(getResources().getString(R.string.webview_login_url))) {
+ webViewLoginMethod = true;
+ webloginUrl = getResources().getString(R.string.webview_login_url);
  showWebViewLoginUrl = getResources().getBoolean(R.bool.show_server_url_input);
  }