mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-27 11:42:16 -05:00
Use 1.6 source compatibility for now
This commit is contained in:
parent
0f476978ce
commit
6a1fee90ee
@ -95,6 +95,10 @@ android {
|
||||
exclude 'META-INF/NOTICE'
|
||||
exclude 'META-INF/NOTICE.txt'
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_6
|
||||
targetCompatibility JavaVersion.VERSION_1_6
|
||||
}
|
||||
}
|
||||
|
||||
check.dependsOn 'checkstyle'
|
||||
|
@ -5118,7 +5118,7 @@ public class MessagingController implements Runnable {
|
||||
publicNotification.setContentText(formattedSender);
|
||||
} else {
|
||||
// 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) {
|
||||
senders.add(getMessageSender(context, account, message));
|
||||
if (senders.size() == NUM_SENDERS_IN_LOCK_SCREEN_NOTIFICATION) {
|
||||
|
@ -252,7 +252,7 @@ public class GlobalSettings {
|
||||
new V(32, new BooleanSetting(false))
|
||||
));
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user