mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-23 16:18:50 -05:00
revert a mismerge from bradleyy's branch
This commit is contained in:
parent
ebfbb9e5b2
commit
505d2866fc
@ -17,8 +17,6 @@ import com.fsck.k9.service.BootReceiver;
|
||||
import com.fsck.k9.service.MailService;
|
||||
|
||||
public class k9 extends Application {
|
||||
public static Application app = null;
|
||||
|
||||
public static final String LOG_TAG = "k9";
|
||||
|
||||
public static File tempDirectory;
|
||||
@ -66,14 +64,13 @@ public class k9 extends Application {
|
||||
* The MIME type(s) of attachments we're willing to download to SD.
|
||||
*/
|
||||
public static final String[] ACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES = new String[] {
|
||||
"image/*",
|
||||
"*/*",
|
||||
};
|
||||
|
||||
/**
|
||||
* The MIME type(s) of attachments we're not willing to download to SD.
|
||||
*/
|
||||
public static final String[] UNACCEPTABLE_ATTACHMENT_DOWNLOAD_TYPES = new String[] {
|
||||
"image/gif",
|
||||
};
|
||||
|
||||
/**
|
||||
@ -90,7 +87,7 @@ public class k9 extends Application {
|
||||
public static final int DEFAULT_VISIBLE_LIMIT = 25;
|
||||
|
||||
/**
|
||||
* Number of additioanl messages to load when a user selectes "Load more messages..."
|
||||
* Number of additional messages to load when a user selectes "Load more messages..."
|
||||
*/
|
||||
public static final int VISIBLE_LIMIT_INCREMENT = 25;
|
||||
|
||||
@ -149,7 +146,6 @@ public class k9 extends Application {
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
app = this;
|
||||
Preferences prefs = Preferences.getPreferences(this);
|
||||
DEBUG = prefs.geteEnableDebugLogging();
|
||||
DEBUG_SENSITIVE = prefs.getEnableSensitiveLogging();
|
||||
@ -160,6 +156,13 @@ public class k9 extends Application {
|
||||
* doesn't work in Android and MimeMessage does not have access to a Context.
|
||||
*/
|
||||
BinaryTempFileBody.setTempDirectory(getCacheDir());
|
||||
|
||||
/*
|
||||
* Enable background sync of messages
|
||||
*/
|
||||
|
||||
setServicesEnabled(this);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user