Эх сурвалжийг харах

Fix #29

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 жил өмнө
parent
commit
2203a7eb0d

+ 3 - 5
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);
                                 }

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -10,7 +10,7 @@
     <string name="nc_server_not_installed">Please finish your %1$s installation</string>
     <string name="nc_server_db_upgrade_needed">Please upgrade your %1$s database</string>
     <string name="nc_server_maintenance">Please bring your %1$s out of maintenance</string>
-    <string name="nc_server_not_nc">%1$s! only works with %2$s servers</string>
+    <string name="nc_server_version">%1$s! only works with %2$s 13 and up</string>
 
     <!-- Account verification -->
     <string name="nc_display_name_fetched">Display name fetched</string>