moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Use 1.6 source compatibility for now

Browse Source
This commit is contained in:
Jan Berkel 2014-12-18 10:07:18 +01:00
parent 0f476978ce
commit 6a1fee90ee
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -95,6 +95,10 @@ android {
exclude 'META-INF/NOTICE' exclude 'META-INF/NOTICE'
exclude 'META-INF/NOTICE.txt' exclude 'META-INF/NOTICE.txt'
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
}
} }
check.dependsOn 'checkstyle' check.dependsOn 'checkstyle'

2
src/com/fsck/k9/controller/MessagingController.java
View File

@ -5118,7 +5118,7 @@ public class MessagingController implements Runnable {
publicNotification.setContentText(formattedSender); publicNotification.setContentText(formattedSender);
} else { } else {
// Use a LinkedHashSet so that we preserve ordering (newest to oldest), but still remove duplicates // Use a LinkedHashSet so that we preserve ordering (newest to oldest), but still remove duplicates
Set<CharSequence> senders = new LinkedHashSet<>(NUM_SENDERS_IN_LOCK_SCREEN_NOTIFICATION); Set<CharSequence> senders = new LinkedHashSet<CharSequence>(NUM_SENDERS_IN_LOCK_SCREEN_NOTIFICATION);
for (Message message : messages) { for (Message message : messages) {
senders.add(getMessageSender(context, account, message)); senders.add(getMessageSender(context, account, message));
if (senders.size() == NUM_SENDERS_IN_LOCK_SCREEN_NOTIFICATION) { if (senders.size() == NUM_SENDERS_IN_LOCK_SCREEN_NOTIFICATION) {

2
src/com/fsck/k9/preferences/GlobalSettings.java
View File

@ -252,7 +252,7 @@ public class GlobalSettings {
new V(32, new BooleanSetting(false)) new V(32, new BooleanSetting(false))
)); ));
s.put("lockScreenNotificationVisibility", Settings.versions( s.put("lockScreenNotificationVisibility", Settings.versions(
new V(37, new EnumSetting<>(LockScreenNotificationVisibility.class, LockScreenNotificationVisibility.MESSAGE_COUNT)) new V(37, new EnumSetting<LockScreenNotificationVisibility>(LockScreenNotificationVisibility.class, LockScreenNotificationVisibility.MESSAGE_COUNT))
)); ));
SETTINGS = Collections.unmodifiableMap(s); SETTINGS = Collections.unmodifiableMap(s);