Merge pull request #14663 from nextcloud/bugfix/authenticator-add-lifecycle-observer

BugFix - AuthenticatorActivity Add LifeCycle Observer For Both Condition

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -327,53 +327,54 @@ protected void onCreate(Bundle savedInstanceState) {
             }
 
             initServerPreFragment(savedInstanceState);
-            ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleEventObserver);
         }
-    }
-        
-        private void showEnforcedServers() {
-            showAuthStatus();
-            accountSetupBinding.hostUrlFrame.setVisibility(View.GONE);
-            accountSetupBinding.hostUrlInputHelperText.setVisibility(View.GONE);
-            accountSetupBinding.scanQr.setVisibility(View.GONE);
-            accountSetupBinding.serversSpinner.setVisibility(View.VISIBLE);
-
-            ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.enforced_servers_spinner);
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
-            ArrayList<String> servers = new ArrayList<>();
-            servers.add("");
-            adapter.add(getString(R.string.please_select_a_server));
 
-            ArrayList<EnforcedServer> t = new Gson().fromJson(getString(R.string.enforce_servers),
-                                                              new TypeToken<ArrayList<EnforcedServer>>() {
-                                                              }
-                                                                  .getType());
+        ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleEventObserver);
+    }
 
-            for (EnforcedServer e : t) {
-                adapter.add(e.getName());
-                servers.add(e.getUrl());
-            }
+    private void showEnforcedServers() {
+        showAuthStatus();
+        accountSetupBinding.hostUrlFrame.setVisibility(View.GONE);
+        accountSetupBinding.hostUrlInputHelperText.setVisibility(View.GONE);
+        accountSetupBinding.scanQr.setVisibility(View.GONE);
+        accountSetupBinding.serversSpinner.setVisibility(View.VISIBLE);
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.enforced_servers_spinner);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        ArrayList<String> servers = new ArrayList<>();
+        servers.add("");
+        adapter.add(getString(R.string.please_select_a_server));
+
+        ArrayList<EnforcedServer> t = new Gson().fromJson(getString(R.string.enforce_servers),
+                                                          new TypeToken<ArrayList<EnforcedServer>>() {
+                                                          }
+                                                              .getType());
+
+        for (EnforcedServer e : t) {
+            adapter.add(e.getName());
+            servers.add(e.getUrl());
+        }
 
-            accountSetupBinding.serversSpinner.setAdapter(adapter);
-            accountSetupBinding.serversSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener(){
+        accountSetupBinding.serversSpinner.setAdapter(adapter);
+        accountSetupBinding.serversSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                    String url = servers.get(position);
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                String url = servers.get(position);
 
-                    if (URLUtil.isValidUrl(url)) {
-                        accountSetupBinding.hostUrlInput.setText(url);
-                        checkOcServer();
-                    }
+                if (URLUtil.isValidUrl(url)) {
+                    accountSetupBinding.hostUrlInput.setText(url);
+                    checkOcServer();
                 }
+            }
 
-                @Override
-                public void onNothingSelected(AdapterView<?> parent) {
-                    // do nothing
-                }
-            });
-        }
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                // do nothing
+            }
+        });
+    }
 
     private final LifecycleEventObserver lifecycleEventObserver = ((lifecycleOwner, event) -> {
         if (event == Lifecycle.Event.ON_START && token != null) {