Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 16:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1379-startup-failure-error' into 'master'

Browse Source 
Correct startup database failure error messages

Closes #1379

See merge request briar/briar!920
This commit is contained in:
akwizgran
2018-09-14 12:01:52 +00:00
parent e32771f964 8813bc36af
commit 74445acb55
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
View File

@@ -46,15 +46,15 @@ public class StartupFailureActivity extends BaseActivity implements
String errorMsg; String errorMsg;
switch (result) { switch (result) {
case DATA_TOO_OLD_ERROR: case DATA_TOO_OLD_ERROR:
errorMsg = getString(R.string.startup_failed_db_error); errorMsg =
getString(R.string.startup_failed_data_too_old_error);
break; break;
case DATA_TOO_NEW_ERROR: case DATA_TOO_NEW_ERROR:
errorMsg = errorMsg =
getString(R.string.startup_failed_data_too_new_error); getString(R.string.startup_failed_data_too_new_error);
break; break;
case DB_ERROR: case DB_ERROR:
errorMsg = errorMsg = getString(R.string.startup_failed_db_error);
getString(R.string.startup_failed_data_too_old_error);
break; break;
case SERVICE_ERROR: case SERVICE_ERROR:
errorMsg = getString(R.string.startup_failed_service_error); errorMsg = getString(R.string.startup_failed_service_error);