moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-08 04:08:15 -05:00
Code Issues Releases Wiki Activity

#619 "Add android wear support"

Browse Source 
Fixed wrong icon.
Summary Notification is phone-only again because it is often clicked when the user intents to do an action only on a single mail.
This commit is contained in:
Marcus Wolschon 2015-05-23 11:05:33 +02:00
parent 937ec6c50e
commit 44b78f09be
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
k9mail/build.gradle
View File

@ -5,9 +5,6 @@ apply from: '../gradle/plugins/findbugs-android.gradle'
repositories {
jcenter()
maven {
url "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
@ -24,7 +21,7 @@ dependencies {
androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
androidTestCompile('com.icegreen:greenmail:1.4.1-SNAPSHOT') {
androidTestCompile('com.icegreen:greenmail:1.4.1') {
exclude group: 'junit'
}
androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0'

2
k9mail/src/main/AndroidManifest.xml
View File

@ -65,7 +65,7 @@
android:name="K9"
android:allowTaskReparenting="false"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:label="@string/beta_app_name"
android:theme="@style/Theme.K9.Startup">
<meta-data

5
k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
View File

@ -4811,6 +4811,7 @@ public class MessagingController implements Runnable {
private void notifyAccount(Context context, Account account,
LocalMessage message, int previousUnreadMessageCount) {
final NotificationData data = getNotificationData(account, previousUnreadMessageCount);
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (data) {
notifyAccountWithDataLocked(context, account, message, data);
}
@ -4874,7 +4875,7 @@ public class MessagingController implements Runnable {
// Archive on wear
NotificationCompat.Action wearActionArchive =
new NotificationCompat.Action.Builder(
R.drawable.ic_action_delete_dark,
R.drawable.ic_action_archive_dark,
context.getString(R.string.notification_action_archive),
NotificationActionService.getArchiveAllMessagesIntent(context, account, allRefs, totalMsgCount > msgCount, notificationID))
.build();
@ -5010,7 +5011,7 @@ public class MessagingController implements Runnable {
//do not set summary notification to localOnly.
//Wear devices use the vibrate pattern of the summary
//despite not displaying the summary
//builder.setLocalOnly(true);
builder.setLocalOnly(true);
if (!data.droppedMessages.isEmpty()) {
style.setSummaryText(context.getString(R.string.notification_additional_messages,