gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #29

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-14 23:15:59 +01:00
parent a0dbae9290
commit 2203a7eb0d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
View File

@ -113,8 +113,7 @@ public class ServerSelectionController extends BaseController {
if (status.isInstalled() && !status.isMaintenance() && if (status.isInstalled() && !status.isMaintenance() &&
!status.isNeedsUpgrade() && !status.isNeedsUpgrade() &&
status.getProductName().equals( status.getVersion().startsWith("13.")) {
getResources().getString(R.string.nc_server_product_name))) {
getRouter().pushController(RouterTransaction.with( getRouter().pushController(RouterTransaction.with(
new WebViewLoginController(finalServerUrl, false)) new WebViewLoginController(finalServerUrl, false))
@ -133,10 +132,9 @@ public class ServerSelectionController extends BaseController {
getString(R.string.nc_server_maintenance), getString(R.string.nc_server_maintenance),
productName), productName),
true); true);
} else if (!status.getProductName().equals( } else if (!status.getVersion().startsWith("13.")) {
getResources().getString(R.string.nc_server_product_name))) {
textFieldBoxes.setError(String.format(getResources(). 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) getResources().getString(R.string.nc_app_name)
, productName), true); , productName), true);
} }

2
app/src/main/res/values/strings.xml
View File

@ -10,7 +10,7 @@
<string name="nc_server_not_installed">Please finish your %1$s installation</string> <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_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_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 --> <!-- Account verification -->
<string name="nc_display_name_fetched">Display name fetched</string> <string name="nc_display_name_fetched">Display name fetched</string>