SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix push notification styling backwards compatibility (#1729)

Browse Source 
* Android Push notification style backwards compatible

* Fix fastlane android release build
This commit is contained in:
Elias Nahum
2018-06-05 14:50:51 -04:00
committed by GitHub
parent 8673bc69c4
commit 64baa64057
6 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
View File

@@ -143,7 +143,15 @@ public class CustomPushNotification extends PushNotification {
// First, get a builder initialized with defaults from the core class.
final Notification.Builder notification = new Notification.Builder(mContext);
Bundle bundle = mNotificationProps.asBundle();
String title = bundle.getString("channel_name");
String version = bundle.getString("version");
String title = null;
if (version.equals("v2")) {
title = bundle.getString("channel_name");
} else {
title = bundle.getString("title");
}
if (android.text.TextUtils.isEmpty(title)) {
ApplicationInfo appInfo = mContext.getApplicationInfo();
title = mContext.getPackageManager().getApplicationLabel(appInfo).toString();
@@ -207,7 +215,13 @@ public class CustomPushNotification extends PushNotification {
.setStyle(new Notification.BigTextStyle()
.bigText(message));
} else {
String summaryTitle = String.format("(%d) %s", numMessages, title);
String summaryTitle = null;
if (version.equals("v2")) {
summaryTitle = String.format("(%d) %s", numMessages, title);
} else {
summaryTitle = String.format("%s (%d)", title, numMessages);
}
Notification.InboxStyle style = new Notification.InboxStyle();
List<Bundle> bundleArray = channelIdToNotification.get(channelId);
@@ -218,7 +232,9 @@ public class CustomPushNotification extends PushNotification {
list = new ArrayList<Bundle>();
}
style.addLine(message);
if (version.equals("v2")) {
style.addLine(message);
}
for (Bundle data : list) {
String msg = data.getString("message");
@@ -227,10 +243,17 @@ public class CustomPushNotification extends PushNotification {
}
}
notification
.setContentTitle(summaryTitle)
.setContentText(message)
.setStyle(style);
if (version.equals("v2")) {
notification
.setContentTitle(summaryTitle)
.setContentText(message)
.setStyle(style);
} else {
style.setBigContentTitle(message)
.setSummaryText(String.format("+%d more", (numMessages - 1)));
notification.setStyle(style)
.setContentTitle(summaryTitle);
}
}
// Let's add a delete intent when the notification is dismissed