wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of uuid field in LocalStore

Browse source
This commit is contained in:
Vincent Breitmoser 2017-08-22 21:55:29 +02:00
parent f37f4233a2
commit 427906f742
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
View file

@ -543,7 +543,7 @@ public class LocalFolder extends Folder<LocalMessage> {
private String getPrefId(String name) { private String getPrefId(String name) {
if (prefId == null) { if (prefId == null) {
prefId = this.localStore.getUUid() + "." + name; prefId = getAccount().getUuid() + "." + name;
} }
return prefId; return prefId;

18
k9mail/src/main/java/com/fsck/k9/mailstore/LocalStore.java
View file

@ -188,7 +188,6 @@ public class LocalStore extends Store {
private final AttachmentInfoExtractor attachmentInfoExtractor; private final AttachmentInfoExtractor attachmentInfoExtractor;
private final Account account; private final Account account;
private final String uUid;
private final LockableDatabase database; private final LockableDatabase database;
/** /**
@ -207,7 +206,6 @@ public class LocalStore extends Store {
attachmentInfoExtractor = AttachmentInfoExtractor.getInstance(); attachmentInfoExtractor = AttachmentInfoExtractor.getInstance();
this.account = account; this.account = account;
this.uUid = account.getUuid();
database = new LockableDatabase(context, account.getUuid(), new StoreSchemaDefinition(this)); database = new LockableDatabase(context, account.getUuid(), new StoreSchemaDefinition(this));
database.setStorageProviderId(account.getLocalStorageProviderId()); database.setStorageProviderId(account.getLocalStorageProviderId());
@ -270,10 +268,6 @@ public class LocalStore extends Store {
return account; return account;
} }
String getUUid() {
return uUid;
}
protected Storage getStorage() { protected Storage getStorage() {
return Preferences.getPreferences(context).getStorage(); return Preferences.getPreferences(context).getStorage();
} }
@ -282,7 +276,7 @@ public class LocalStore extends Store {
final StorageManager storageManager = StorageManager.getInstance(context); final StorageManager storageManager = StorageManager.getInstance(context);
final File attachmentDirectory = storageManager.getAttachmentDirectory(uUid, final File attachmentDirectory = storageManager.getAttachmentDirectory(account.getUuid(),
database.getStorageProviderId()); database.getStorageProviderId());
return database.execute(false, new DbCallback<Long>() { return database.execute(false, new DbCallback<Long>() {
@ -298,7 +292,7 @@ public class LocalStore extends Store {
} }
} }
final File dbFile = storageManager.getDatabase(uUid, database.getStorageProviderId()); final File dbFile = storageManager.getDatabase(account.getUuid(), database.getStorageProviderId());
return dbFile.length() + attachmentLength; return dbFile.length() + attachmentLength;
} }
}); });
@ -468,7 +462,8 @@ public class LocalStore extends Store {
private void deleteAllMessagePartsDataFromDisk() { private void deleteAllMessagePartsDataFromDisk() {
final StorageManager storageManager = StorageManager.getInstance(context); final StorageManager storageManager = StorageManager.getInstance(context);
File attachmentDirectory = storageManager.getAttachmentDirectory(uUid, database.getStorageProviderId()); File attachmentDirectory = storageManager.getAttachmentDirectory(
account.getUuid(), database.getStorageProviderId());
File[] files = attachmentDirectory.listFiles(); File[] files = attachmentDirectory.listFiles();
if (files == null) { if (files == null) {
return; return;
@ -897,7 +892,8 @@ public class LocalStore extends Store {
File getAttachmentFile(String attachmentId) { File getAttachmentFile(String attachmentId) {
final StorageManager storageManager = StorageManager.getInstance(context); final StorageManager storageManager = StorageManager.getInstance(context);
final File attachmentDirectory = storageManager.getAttachmentDirectory(uUid, database.getStorageProviderId()); final File attachmentDirectory = storageManager.getAttachmentDirectory(
account.getUuid(), database.getStorageProviderId());
return new File(attachmentDirectory, attachmentId); return new File(attachmentDirectory, attachmentId);
} }
@ -999,7 +995,7 @@ public class LocalStore extends Store {
} }
void notifyChange() { void notifyChange() {
Uri uri = Uri.withAppendedPath(EmailProvider.CONTENT_URI, "account/" + uUid + "/messages"); Uri uri = Uri.withAppendedPath(EmailProvider.CONTENT_URI, "account/" + account.getUuid() + "/messages");
contentResolver.notifyChange(uri, null); contentResolver.notifyChange(uri, null);
} }