Merge remote-tracking branch 'origin/development' into lockout

Cveman1 · Nov 10, 2021 · c5cc928 · c5cc928
2 parents 9e25c84 + dd6c829
commit c5cc928
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...p/src/main/java/org/opendatakit/services/sync/actions/activities/AbsSyncBaseActivity.java b/...p/src/main/java/org/opendatakit/services/sync/actions/activities/AbsSyncBaseActivity.java
@@ -40,6 +40,7 @@
 import org.opendatakit.consts.IntentConsts;
 import org.opendatakit.fragment.AboutMenuFragment;
 import org.opendatakit.logging.WebLogger;
+import org.opendatakit.logging.desktop.WebLoggerDesktopFactoryImpl;
 import org.opendatakit.properties.CommonToolProperties;
 import org.opendatakit.properties.PropertiesSingleton;
 import org.opendatakit.services.R;
@@ -317,7 +318,9 @@ public static void showAuthenticationErrorDialog(final Activity activity, String
       builder.setMessage(message);
       builder.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
          public void onClick(DialogInterface dialog, int id) {
-            activity.finish();
+            if (activity instanceof VerifyServerSettingsActivity){
+               activity.finish();
+            }
             dialog.dismiss();
          }
       });