getUuid() -> getAccountUuid()

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);
     }

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);
     }

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);

src/com/fsck/k9/local/LocalFolder.java

@@ -99,7 +99,7 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
         return mFolderId;
     }
 
-    public String getUuid()
+    public String getAccountUuid()
     {
         return getAccount().getUuid();
     }
@@ -1890,7 +1890,7 @@ public class LocalFolder extends Folder<LocalMessage> 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

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;
     }