diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java index 2efdde8a3..83924caac 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java @@ -113,8 +113,7 @@ public class ServerSelectionController extends BaseController { if (status.isInstalled() && !status.isMaintenance() && !status.isNeedsUpgrade() && - status.getProductName().equals( - getResources().getString(R.string.nc_server_product_name))) { + status.getVersion().startsWith("13.")) { getRouter().pushController(RouterTransaction.with( new WebViewLoginController(finalServerUrl, false)) @@ -133,10 +132,9 @@ public class ServerSelectionController extends BaseController { getString(R.string.nc_server_maintenance), productName), true); - } else if (!status.getProductName().equals( - getResources().getString(R.string.nc_server_product_name))) { + } else if (!status.getVersion().startsWith("13.")) { textFieldBoxes.setError(String.format(getResources(). - getString(R.string.nc_server_not_nc), + getString(R.string.nc_server_version), getResources().getString(R.string.nc_app_name) , productName), true); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39dc6d09f..be4995a72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,7 @@ Please finish your %1$s installation Please upgrade your %1$s database Please bring your %1$s out of maintenance - %1$s! only works with %2$s servers + %1$s! only works with %2$s 13 and up Display name fetched