Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1154-fix-notification-light' into 'maintenance-0.16'

Browse Source 
Backport: Fix notification light

See merge request akwizgran/briar!713
This commit is contained in:
Torsten Grote
2018-03-06 18:17:46 +00:00
parent d3aebc4aba 6324fb72a5
commit 4c661cd4bb
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
View File

@@ -11,6 +11,7 @@ import android.net.Uri;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v4.app.TaskStackBuilder; import android.support.v4.app.TaskStackBuilder;
import android.support.v4.content.ContextCompat;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -171,9 +172,13 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
@TargetApi(26) @TargetApi(26)
private void createNotificationChannel(String channelId, private void createNotificationChannel(String channelId,
@StringRes int name) { @StringRes int name) {
notificationManager.createNotificationChannel( NotificationChannel nc =
new NotificationChannel(channelId, appContext.getString(name), new NotificationChannel(channelId, appContext.getString(name),
IMPORTANCE_DEFAULT)); IMPORTANCE_DEFAULT);
nc.enableLights(true);
nc.setLightColor(
ContextCompat.getColor(appContext, R.color.briar_green_light));
notificationManager.createNotificationChannel(nc);
} }
@Override @Override

5
briar-android/src/main/java/org/briarproject/briar/android/util/BriarNotificationBuilder.java
View File

@@ -6,6 +6,8 @@ import android.support.annotation.ColorRes;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import org.briarproject.briar.R;
import static android.support.v4.app.NotificationCompat.VISIBILITY_PRIVATE; import static android.support.v4.app.NotificationCompat.VISIBILITY_PRIVATE;
import static android.support.v4.app.NotificationCompat.VISIBILITY_SECRET; import static android.support.v4.app.NotificationCompat.VISIBILITY_SECRET;
@@ -17,6 +19,9 @@ public class BriarNotificationBuilder extends NotificationCompat.Builder {
// Auto-cancel does not fire the delete intent, see // Auto-cancel does not fire the delete intent, see
// https://issuetracker.google.com/issues/36961721 // https://issuetracker.google.com/issues/36961721
setAutoCancel(true); setAutoCancel(true);
setLights(ContextCompat.getColor(context, R.color.briar_green_light),
750, 500);
} }
public BriarNotificationBuilder setColorRes(@ColorRes int res) { public BriarNotificationBuilder setColorRes(@ColorRes int res) {