TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-23 21:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update compileSdk to 27

Browse Source
This commit is contained in:
Moxie Marlinspike
2017-11-26 16:32:18 -08:00
parent 7a5846a6d4
commit 4c8e259b56
2 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@@ -46,6 +46,9 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
private SlideDeck slideDeck;
private final MasterSecret masterSecret;
private CharSequence contentTitle;
private CharSequence contentText;
public SingleRecipientNotificationBuilder(@NonNull Context context,
@Nullable MasterSecret masterSecret,
@NonNull NotificationPrivacyPreference privacy)
@@ -121,7 +124,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
@NonNull PendingIntent androidAutoHeardIntent, long timestamp)
{
if (mContentTitle == null || mContentText == null)
if (contentTitle == null || contentText == null)
return;
RemoteInput remoteInput = new RemoteInput.Builder(AndroidAutoReplyReceiver.VOICE_REPLY_KEY)
@@ -129,8 +132,8 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
.build();
NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder =
new NotificationCompat.CarExtender.UnreadConversation.Builder(mContentTitle.toString())
.addMessage(mContentText.toString())
new NotificationCompat.CarExtender.UnreadConversation.Builder(contentTitle.toString())
.addMessage(contentText.toString())
.setLatestTimestamp(timestamp)
.setReadPendingIntent(androidAutoHeardIntent)
.setReplyAction(androidAutoReplyIntent, remoteInput);
@@ -255,6 +258,17 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
}
}
@Override
public NotificationCompat.Builder setContentTitle(CharSequence contentTitle) {
this.contentTitle = contentTitle;
return super.setContentTitle(contentTitle);
}
public NotificationCompat.Builder setContentText(CharSequence contentText) {
this.contentText = contentText;
return super.setContentText(contentText);
}
private CharSequence getBigText(List<CharSequence> messageBodies) {
SpannableStringBuilder content = new SpannableStringBuilder();