From bd697bb56d485802dba771ce1e18d09f8d352b3e Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Sun, 14 Dec 2014 15:26:38 +0000 Subject: [PATCH] getUuid() -> getAccountUuid() --- src/com/fsck/k9/controller/MessagingController.java | 2 +- src/com/fsck/k9/fragment/MessageListFragment.java | 4 ++-- src/com/fsck/k9/helper/MessageHelper.java | 2 +- src/com/fsck/k9/local/LocalFolder.java | 4 ++-- src/com/fsck/k9/local/LocalMessage.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index a955c9199..c95748874 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -329,7 +329,7 @@ public class MessagingController implements Runnable { long messageId = message.getId(); long folderId = message.getFolder().getId(); - EmailProviderCache cache = EmailProviderCache.getCache(message.getFolder().getUuid(), + EmailProviderCache cache = EmailProviderCache.getCache(message.getFolder().getAccountUuid(), mApplication.getApplicationContext()); return cache.isMessageHidden(messageId, folderId); } diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java index dae7ec49d..46760b3fa 100644 --- a/src/com/fsck/k9/fragment/MessageListFragment.java +++ b/src/com/fsck/k9/fragment/MessageListFragment.java @@ -2434,7 +2434,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_MOVE, folder, - messages.get(0).getFolder().getUuid(), null, + messages.get(0).getFolder().getAccountUuid(), null, messages); } @@ -2463,7 +2463,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener } displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_COPY, folder, - messages.get(0).getFolder().getUuid(), + messages.get(0).getFolder().getAccountUuid(), null, messages); } diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java index 4cde05621..5e88d3b5e 100644 --- a/src/com/fsck/k9/helper/MessageHelper.java +++ b/src/com/fsck/k9/helper/MessageHelper.java @@ -71,7 +71,7 @@ public class MessageHelper { } target.uid = message.getUid(); - target.account = message.getFolder().getUuid(); + target.account = message.getFolder().getAccountUuid(); target.uri = message.getUri(); } catch (MessagingException me) { Log.w(K9.LOG_TAG, "Unable to load message info", me); diff --git a/src/com/fsck/k9/local/LocalFolder.java b/src/com/fsck/k9/local/LocalFolder.java index a35428adb..9fa2bcc79 100644 --- a/src/com/fsck/k9/local/LocalFolder.java +++ b/src/com/fsck/k9/local/LocalFolder.java @@ -99,7 +99,7 @@ public class LocalFolder extends Folder implements Serializable { return mFolderId; } - public String getUuid() + public String getAccountUuid() { return getAccount().getUuid(); } @@ -1890,7 +1890,7 @@ public class LocalFolder extends Folder implements Serializable { public Void doDbWork(final SQLiteDatabase db) throws WrappedException, UnavailableStorageException { Cursor attachmentsCursor = null; try { - String accountUuid = getUuid(); + String accountUuid = getAccountUuid(); Context context = LocalFolder.this.localStore.mApplication; // Get attachment IDs diff --git a/src/com/fsck/k9/local/LocalMessage.java b/src/com/fsck/k9/local/LocalMessage.java index cc9cef2de..292be2c51 100644 --- a/src/com/fsck/k9/local/LocalMessage.java +++ b/src/com/fsck/k9/local/LocalMessage.java @@ -573,7 +573,7 @@ public class LocalMessage extends MimeMessage { mReference = new MessageReference(); mReference.folderName = getFolder().getName(); mReference.uid = mUid; - mReference.accountUuid = getFolder().getUuid(); + mReference.accountUuid = getFolder().getAccountUuid(); } return mReference; }