empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix activity leak when initializing singletons

Browse source 
Closes #3219
// FREEBIE
This commit is contained in:
Jake McGinty 2015-05-21 02:32:38 -07:00 • committed by Moxie Marlinspike
parent 1beed21032
commit 5b788fe188
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/database/CanonicalAddressDatabase.java
View file

@ -56,7 +56,7 @@ public class CanonicalAddressDatabase {
public static CanonicalAddressDatabase getInstance(Context context) { public static CanonicalAddressDatabase getInstance(Context context) {
synchronized (lock) { synchronized (lock) {
if (instance == null) if (instance == null)
instance = new CanonicalAddressDatabase(context); instance = new CanonicalAddressDatabase(context.getApplicationContext());
return instance; return instance;
} }
@ -69,7 +69,7 @@ public class CanonicalAddressDatabase {
public void reset(Context context) { public void reset(Context context) {
DatabaseHelper old = this.databaseHelper; DatabaseHelper old = this.databaseHelper;
this.databaseHelper = new DatabaseHelper(context, DATABASE_NAME, null, DATABASE_VERSION); this.databaseHelper = new DatabaseHelper(context.getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
old.close(); old.close();
fillCache(); fillCache();
} }

2
src/org/thoughtcrime/securesms/database/DatabaseFactory.java
View file

@ -85,7 +85,7 @@ public class DatabaseFactory {
public static DatabaseFactory getInstance(Context context) { public static DatabaseFactory getInstance(Context context) {
synchronized (lock) { synchronized (lock) {
if (instance == null) if (instance == null)
instance = new DatabaseFactory(context); instance = new DatabaseFactory(context.getApplicationContext());
return instance; return instance;
} }