rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clear the cache to keep a small memory when the app is down

Browse Source
This commit is contained in:
J-Jamet
2018-09-15 17:22:42 +02:00
parent df80084822
commit 9ff6e7a080
8 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@@ -103,6 +103,7 @@ dependencies {
annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionDispatcherVersion"
// Apache Commons Collections
implementation 'commons-collections:commons-collections:3.2.1'
implementation 'org.apache.commons:commons-io:1.3.2'
// Base64
implementation 'biz.source_code:base64coder:2010-12-19'
// IO-Extras

2
app/src/main/java/com/kunzisoft/keepass/app/App.java
View File

@@ -92,7 +92,7 @@ public class App extends MultiDexApplication {
@Override
public void onTerminate() {
if ( db != null ) {
db.clear();
db.clear(getApplicationContext());
}
super.onTerminate();
}

2
app/src/main/java/com/kunzisoft/keepass/database/BinaryPool.java
View File

@@ -51,6 +51,8 @@ public class BinaryPool {
}
public void clear() {
for (Entry<Integer, ProtectedBinary> entry: pool.entrySet())
entry.getValue().clear();
pool.clear();
}

51
app/src/main/java/com/kunzisoft/keepass/database/Database.java
View File

@@ -39,6 +39,8 @@ import com.kunzisoft.keepass.icons.IconDrawableFactory;
import com.kunzisoft.keepass.tasks.ProgressTaskUpdater;
import com.kunzisoft.keepass.utils.UriUtil;
import org.apache.commons.io.FileUtils;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileNotFoundException;
@@ -58,7 +60,7 @@ public class Database {
private static final String TAG = Database.class.getName();
private PwDatabase pm;
private PwDatabase pwDatabase;
private Uri mUri;
private SearchDbHelper searchHelper;
private boolean readOnly = false;
@@ -69,11 +71,11 @@ public class Database {
private boolean loaded = false;
public PwDatabase getPwDatabase() {
return pm;
return pwDatabase;
}
public void setPwDatabase(PwDatabase pm) {
this.pm = pm;
this.pwDatabase = pm;
}
public void setUri(Uri mUri) {
@@ -156,20 +158,20 @@ public class Database {
bis.reset(); // Return to the start
pm = databaseImporter.openDatabase(bis, password, keyFileInputStream, progressTaskUpdater);
if ( pm != null ) {
pwDatabase = databaseImporter.openDatabase(bis, password, keyFileInputStream, progressTaskUpdater);
if ( pwDatabase != null ) {
try {
switch (pm.getVersion()) {
switch (pwDatabase.getVersion()) {
case V3:
PwGroupV3 rootV3 = ((PwDatabaseV3) pm).getRootGroup();
((PwDatabaseV3) pm).populateGlobals(rootV3);
passwordEncodingError = !pm.validatePasswordEncoding(password);
PwGroupV3 rootV3 = ((PwDatabaseV3) pwDatabase).getRootGroup();
((PwDatabaseV3) pwDatabase).populateGlobals(rootV3);
passwordEncodingError = !pwDatabase.validatePasswordEncoding(password);
searchHelper = new SearchDbHelper.SearchDbHelperV3(ctx);
break;
case V4:
PwGroupV4 rootV4 = ((PwDatabaseV4) pm).getRootGroup();
((PwDatabaseV4) pm).populateGlobals(rootV4);
passwordEncodingError = !pm.validatePasswordEncoding(password);
PwGroupV4 rootV4 = ((PwDatabaseV4) pwDatabase).getRootGroup();
((PwDatabaseV4) pwDatabase).populateGlobals(rootV4);
passwordEncodingError = !pwDatabase.validatePasswordEncoding(password);
searchHelper = new SearchDbHelper.SearchDbHelperV4(ctx);
break;
}
@@ -188,11 +190,11 @@ public class Database {
public PwGroup search(String str, int max) {
if (searchHelper == null) { return null; }
try {
switch (pm.getVersion()) {
switch (pwDatabase.getVersion()) {
case V3:
return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pm), str, max);
return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pwDatabase), str, max);
case V4:
return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pm), str, max);
return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pwDatabase), str, max);
}
} catch (Exception e) {
Log.e(TAG, "Search can't be performed with this SearchHelper", e);
@@ -262,7 +264,7 @@ public class Database {
FileOutputStream fos = null;
try {
fos = new FileOutputStream(tempFile);
PwDbOutput pmo = PwDbOutput.getInstance(pm, fos);
PwDbOutput pmo = PwDbOutput.getInstance(pwDatabase, fos);
if (pmo != null)
pmo.output();
} catch (Exception e) {
@@ -290,7 +292,7 @@ public class Database {
OutputStream os = null;
try {
os = ctx.getContentResolver().openOutputStream(uri);
PwDbOutput pmo = PwDbOutput.getInstance(pm, os);
PwDbOutput pmo = PwDbOutput.getInstance(pwDatabase, os);
if (pmo != null)
pmo.output();
} catch (Exception e) {
@@ -305,10 +307,19 @@ public class Database {
}
// TODO Clear database when lock broadcast is receive in backstage
public void clear() {
public void clear(Context context) {
drawFactory.clearCache();
// Delete the cache of the database if present
if (pwDatabase != null)
pwDatabase.clearCache();
// In all cases, delete all the files in the temp dir
try {
FileUtils.cleanDirectory(context.getFilesDir());
} catch (IOException e) {
Log.e(TAG, "Unable to clear the directory cache.", e);
}
pm = null;
pwDatabase = null;
mUri = null;
loaded = false;
passwordEncodingError = false;
@@ -546,7 +557,7 @@ public class Database {
case V4:
newPwGroup = new PwGroupV4((PwGroupV4) parent);
}
newPwGroup.setId(pm.newGroupId());
newPwGroup.setId(pwDatabase.newGroupId());
} catch (Exception e) {
Log.e(TAG, "This version of PwGroup can't be created", e);
}

2
app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java
View File

@@ -430,4 +430,6 @@ public abstract class PwDatabase<PwGroupDB extends PwGroup<PwGroupDB, PwEntryDB>
*/
public abstract void initNew(String dbPath);
public void clearCache() {}
}

5
app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java
View File

@@ -754,4 +754,9 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
return filename.substring(0, lastExtDot);
}
@Override
public void clearCache() {
super.clearCache();
binPool.clear();
}
}

14
app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedBinary.java
View File

@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.database.security;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.Log;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -31,7 +32,8 @@ import java.util.Arrays;
import java.util.Objects;
public class ProtectedBinary implements Parcelable {
private static final String TAG = ProtectedBinary.class.getName();
public final static ProtectedBinary EMPTY = new ProtectedBinary();
private boolean protect;
@@ -84,6 +86,12 @@ public class ProtectedBinary implements Parcelable {
return null;
}
public void clear() {
data = null;
if (dataFile != null && !dataFile.delete())
Log.e(TAG, "Unable to delete temp file " + dataFile.getAbsolutePath());
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -92,13 +100,13 @@ public class ProtectedBinary implements Parcelable {
return protect == that.protect &&
size == that.size &&
Arrays.equals(data, that.data) &&
Objects.equals(dataFile, that.dataFile);
Objects.equals(dataFile, that.dataFile); // TODO old equals
}
@Override
public int hashCode() {
int result = Objects.hash(protect, dataFile, size);
int result = Objects.hash(protect, dataFile, size); // TODO old hash
result = 31 * result + Arrays.hashCode(data);
return result;
}

4
app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java
View File

@@ -252,7 +252,7 @@ public class PasswordActivity extends StylishActivity
case LockingActivity.RESULT_EXIT_LOCK:
case Activity.RESULT_CANCELED:
setEmptyViews();
App.getDB().clear();
App.getDB().clear(getApplicationContext());
break;
}
}
@@ -938,7 +938,7 @@ public class PasswordActivity extends StylishActivity
private void loadDatabase(String password, Uri keyfile) {
// Clear before we load
Database database = App.getDB();
database.clear();
database.clear(getApplicationContext());
// Clear the shutdown flag
App.clearShutdown();