moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Merge pull request #14 from k9mail/art/tidy-application-ref

Browse Source 
remove unnecessary method parameters
This commit is contained in:
tobiasbaum 2014-10-19 21:53:42 +02:00
commit 3dab8a2ad1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/fsck/k9/mail/store/LockableDatabase.java
View File

@ -99,7 +99,7 @@ public class LockableDatabase {
}
try {
openOrCreateDataspace(mApplication);
openOrCreateDataspace();
} catch (UnavailableStorageException e) {
Log.e(K9.LOG_TAG, "Unable to open DB on mount", e);
}
@ -346,7 +346,7 @@ public class LockableDatabase {
mStorageProviderId = newProviderId;
// re-initialize this class with the new Uri
openOrCreateDataspace(mApplication);
openOrCreateDataspace();
} finally {
unlockWrite(newProviderId);
}
@ -358,7 +358,7 @@ public class LockableDatabase {
public void open() throws UnavailableStorageException {
lockWrite();
try {
openOrCreateDataspace(mApplication);
openOrCreateDataspace();
} finally {
unlockWrite();
}
@ -367,21 +367,20 @@ public class LockableDatabase {
/**
*
* @param application
* @throws UnavailableStorageException
*/
protected void openOrCreateDataspace(final Application application) throws UnavailableStorageException {
private void openOrCreateDataspace() throws UnavailableStorageException {
lockWrite();
try {
final File databaseFile = prepareStorage(mStorageProviderId);
try {
doOpenOrCreateDb(application, databaseFile);
doOpenOrCreateDb(databaseFile);
} catch (SQLiteException e) {
// try to gracefully handle DB corruption - see issue 2537
Log.w(K9.LOG_TAG, "Unable to open DB " + databaseFile + " - removing file and retrying", e);
databaseFile.delete();
doOpenOrCreateDb(application, databaseFile);
doOpenOrCreateDb(databaseFile);
}
if (mDb.getVersion() != mSchemaDefinition.getVersion()) {
mSchemaDefinition.doDbUpgrade(mDb);
@ -391,10 +390,10 @@ public class LockableDatabase {
}
}
private void doOpenOrCreateDb(final Application application, final File databaseFile) {
private void doOpenOrCreateDb(final File databaseFile) {
if (StorageManager.InternalStorageProvider.ID.equals(mStorageProviderId)) {
// internal storage
mDb = application.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE,
mDb = mApplication.openOrCreateDatabase(databaseFile.getName(), Context.MODE_PRIVATE,
null);
} else {
// external storage
@ -487,7 +486,7 @@ public class LockableDatabase {
}
if (recreate) {
openOrCreateDataspace(mApplication);
openOrCreateDataspace();
} else {
// stop waiting for mount/unmount events
getStorageManager().removeListener(mStorageListener);