Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd839a99 authored by cketti's avatar cketti
Browse files

Merge pull request #3 from frommeyerc/merge-upstream 

Extract inner classes from LocalStore
parents 2e318096 9dba60c9

src/com/fsck/k9/Account.java

+1 −1
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import com.fsck.k9.mail.Address; 
import com.fsck.k9.mail.MessagingException;

import com.fsck.k9.mail.Store;

import com.fsck.k9.mail.Folder.FolderClass;

import com.fsck.k9.mail.store.LocalStore;

import com.fsck.k9.mail.store.StorageManager;

import com.fsck.k9.mail.store.StorageManager.StorageProvider;

import com.fsck.k9.mail.store.local.LocalStore;

import com.fsck.k9.provider.EmailProvider;

import com.fsck.k9.provider.EmailProvider.StatsColumns;

import com.fsck.k9.search.ConditionsTreeNode;

src/com/fsck/k9/K9.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import com.fsck.k9.mail.Address; 
import com.fsck.k9.mail.Message;

import com.fsck.k9.mail.MessagingException;

import com.fsck.k9.mail.internet.BinaryTempFileBody;

import com.fsck.k9.mail.store.LocalStore;

import com.fsck.k9.mail.store.local.LocalStore;

import com.fsck.k9.provider.UnreadWidgetProvider;

import com.fsck.k9.security.LocalKeyStore;

import com.fsck.k9.service.BootReceiver;

src/com/fsck/k9/activity/FolderList.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; 
import com.fsck.k9.mail.Folder;

import com.fsck.k9.mail.Message;

import com.fsck.k9.mail.MessagingException;

import com.fsck.k9.mail.store.LocalStore.LocalFolder;

import com.fsck.k9.mail.store.local.LocalFolder;

import com.fsck.k9.search.LocalSearch;

import com.fsck.k9.search.SearchSpecification.Attribute;

import com.fsck.k9.search.SearchSpecification.Searchfield;

src/com/fsck/k9/activity/MessageCompose.java

+3 −3
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ import com.fsck.k9.mail.internet.MimeMultipart; 
import com.fsck.k9.mail.internet.MimeUtility;

import com.fsck.k9.mail.internet.TextBody;

import com.fsck.k9.mail.internet.TextBodyBuilder;

import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBody;

import com.fsck.k9.mail.store.LocalStore.TempFileBody;

import com.fsck.k9.mail.store.LocalStore.TempFileMessageBody;

import com.fsck.k9.mail.store.local.LocalAttachmentBody;

import com.fsck.k9.mail.store.local.TempFileBody;

import com.fsck.k9.mail.store.local.TempFileMessageBody;

import com.fsck.k9.view.MessageWebView;



import org.apache.james.mime4j.codec.EncoderUtil;

src/com/fsck/k9/activity/UpgradeDatabases.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.widget.TextView; 
 * <li>{@link #actionUpgradeDatabases(Context, Intent)} will call {@link K9#areDatabasesUpToDate()}

 *     to check if we already know whether the databases have been upgraded.</li>

 * <li>{@link K9#areDatabasesUpToDate()} will compare the last known database version stored in a

 *     {@link SharedPreferences} file to {@link com.fsck.k9.mail.store.LocalStore#DB_VERSION}. This

 *     {@link SharedPreferences} file to {@link com.fsck.k9.mail.store.local.LocalStore#DB_VERSION}. This

 *     is done as an optimization because it's faster than opening all of the accounts' databases

 *     one by one.</li>

 * <li>If there was an error reading the cached database version or if it shows the databases need