Skip to content

PM QA 7620 #3012

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
pm-dimagi merged 1 commit into from
Apr 3, 2025
Merged

PM QA 7620 #3012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions app/src/org/commcare/connect/database/ConnectUserDatabaseUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
import org.javarosa.core.services.Logger;

public class ConnectUserDatabaseUtil {
private static final Object LOCK = new Object();

public static ConnectUserRecord getUser(Context context) {
if (context == null) {
throw new IllegalArgumentException("Context must not be null");
}
synchronized (LOCK) {
if (!ConnectDatabaseHelper.dbExists(context)) {
return null;
}
Expand All @@ -31,7 +29,6 @@ public static ConnectUserRecord getUser(Context context) {
ConnectDatabaseHelper.dbBroken = true;
throw new RuntimeException("Failed to access Connect database", e);
}
}
}

public static void storeUser(Context context, ConnectUserRecord user) {
Expand All @@ -41,25 +38,23 @@ public static void storeUser(Context context, ConnectUserRecord user) {
if (user == null) {
throw new IllegalArgumentException("User must not be null");
}
synchronized (LOCK) {
try {
ConnectDatabaseHelper.getConnectStorage(context, ConnectUserRecord.class).write(user);
} catch (Exception e) {
Logger.exception("Failed to store user", e);
throw new RuntimeException("Failed to store user in Connect database", e);
}
}
}

public static void forgetUser(Context context) {
if (context == null) {
throw new IllegalArgumentException("Context must not be null");
}
synchronized (LOCK) {
try {
DatabaseConnectOpenHelper.deleteDb(context);
CommCareApplication.instance().getGlobalStorage(ConnectKeyRecord.class).removeAll();
ConnectDatabaseHelper.dbBroken = false;
ConnectDatabaseHelper.teardown();
Copy link
Contributor

@shubham1g5 shubham1g5 Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this the primary fix here or removal of synchronized blocks ?

Copy link
Contributor Author

@pm-dimagi pm-dimagi Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the primary fix is this one lock dosent help because connectdatabse is not getting null

} catch (IllegalStateException e) {
Logger.exception("Database access error while forgetting user", e);
throw new RuntimeException("Failed to access database while cleaning up", e);
Expand All @@ -70,6 +65,5 @@ public static void forgetUser(Context context) {
Logger.exception("Failed to forget user", e);
throw new RuntimeException("Failed to clean up Connect database", e);
}
}
}
}