Skip to content

Fix repeated crash at app startup on corrupt Connect DB. #3411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OrangeAndGreen merged 4 commits into from
Nov 12, 2025
Merged

Fix repeated crash at app startup on corrupt Connect DB. #3411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cdf213
Deleting Connect DB immediately when crash DB is called, so it's gone…
OrangeAndGreen Nov 7, 2025
be2aeb7
Renamed handleGlobalErrors to getGlobalErrors.
OrangeAndGreen Nov 10, 2025
996a428
Merge branch 'master' into db_crash_point
OrangeAndGreen Nov 11, 2025
8d36eed
Merge branch 'master' into db_crash_point
OrangeAndGreen Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/org/commcare/activities/CommCareSetupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ protected void onCreate(Bundle savedInstanceState) {
return;
}
if (!fromManager) {
String errors = GlobalErrorUtil.handleGlobalErrors();
String errors = GlobalErrorUtil.getGlobalErrors();
globalError = errors.length() > 0 ? errors : null;

PersonalIdManager.getInstance().init(this);
Expand Down
2 changes: 1 addition & 1 deletion app/src/org/commcare/activities/LoginActivityUIController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ protected LoginMode getLoginMode() {
}

protected void checkForGlobalErrors() {
String errors = GlobalErrorUtil.handleGlobalErrors();
String errors = GlobalErrorUtil.getGlobalErrors();
if(errors.length() > 0) {
errorMessage.setVisibility(View.VISIBLE);
errorMessage.setText(errors);
Expand Down
5 changes: 4 additions & 1 deletion app/src/org/commcare/connect/database/ConnectDatabaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import org.commcare.android.database.connect.models.ConnectLinkedAppRecord;
import org.commcare.android.database.connect.models.ConnectUserRecord;
import org.commcare.android.database.global.models.GlobalErrorRecord;
import org.commcare.connect.PersonalIdManager;
import org.commcare.connect.network.SsoToken;
import org.commcare.google.services.analytics.AnalyticsParamValue;
import org.commcare.models.database.AndroidDbHelper;
import org.commcare.models.database.IDatabase;
import org.commcare.models.database.EncryptedDatabaseAdapter;
Expand Down Expand Up @@ -50,7 +52,7 @@ public IDatabase getHandle() {
if (connectDatabase == null || !connectDatabase.isOpen()) {
try {
byte[] passphrase = ConnectDatabaseUtils.getConnectDbPassphrase(context);
if(passphrase == null) {
if(passphrase == null || passphrase.length == 0) {
throw new IllegalStateException("Attempting to access Connect DB without a passphrase");
}

Expand Down Expand Up @@ -83,6 +85,7 @@ public static void crashDb(GlobalErrors error) {

public static void crashDb(GlobalErrors error, Exception ex) {
GlobalErrorUtil.addError(new GlobalErrorRecord(new Date(), error.ordinal()));
PersonalIdManager.getInstance().forgetUser(AnalyticsParamValue.PERSONAL_ID_FORGOT_USER_DB_ERROR);
throw new RuntimeException("Connect database crash: " + error.name(), ex);
}

Expand Down
12 changes: 1 addition & 11 deletions app/src/org/commcare/utils/GlobalErrorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import org.commcare.CommCareApplication;
import org.commcare.android.database.global.models.GlobalErrorRecord;
import org.commcare.connect.PersonalIdManager;
import org.commcare.google.services.analytics.AnalyticsParamValue;
import org.commcare.models.database.SqlStorage;

import java.util.Vector;
Expand All @@ -13,9 +11,8 @@ public static void addError(GlobalErrorRecord error) {
CommCareApplication.instance().getGlobalStorage(GlobalErrorRecord.class).write(error);
}

public static String handleGlobalErrors() {
public static String getGlobalErrors() {
StringBuilder sb = new StringBuilder();
boolean deleteConnectStorage = false;
SqlStorage<GlobalErrorRecord> storage = CommCareApplication.instance()
.getGlobalStorage(GlobalErrorRecord.class);
Vector<GlobalErrorRecord> errors = storage.getRecordsForValues(new String[]{}, new String[]{});
Expand All @@ -29,13 +26,6 @@ public static String handleGlobalErrors() {
GlobalErrors ge = GlobalErrors.values()[error.getErrorCode()];

sb.append(CommCareApplication.instance().getString(ge.getMessageId()));

deleteConnectStorage |= ge == GlobalErrors.PERSONALID_GENERIC_ERROR
|| ge == GlobalErrors.PERSONALID_LOST_CONFIGURATION_ERROR;
}

if(deleteConnectStorage) {
PersonalIdManager.getInstance().forgetUser(AnalyticsParamValue.PERSONAL_ID_FORGOT_USER_DB_ERROR);
}

//Clear the errors once retrieved
Expand Down