mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
fix some lint issues
This commit is contained in:
@@ -32,8 +32,8 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
|
||||
protected Context context;
|
||||
protected NotificationPrivacyPreference privacy;
|
||||
|
||||
public AbstractNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
|
||||
super(context);
|
||||
AbstractNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
|
||||
super(context, createMsgNotificationChannel(context));
|
||||
|
||||
this.context = context;
|
||||
this.privacy = privacy;
|
||||
@@ -41,7 +41,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
|
||||
setLed();
|
||||
}
|
||||
|
||||
protected CharSequence getStyledMessage(@NonNull Recipient recipient, @Nullable CharSequence message) {
|
||||
CharSequence getStyledMessage(@NonNull Recipient recipient, @Nullable CharSequence message) {
|
||||
SpannableStringBuilder builder = new SpannableStringBuilder();
|
||||
builder.append(Util.getBoldedString(recipient.toShortString()));
|
||||
builder.append(": ");
|
||||
@@ -50,7 +50,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
|
||||
return builder;
|
||||
}
|
||||
|
||||
public void setAlarms(@Nullable Uri ringtone, Prefs.VibrateState vibrate) {
|
||||
void setAlarms(@Nullable Uri ringtone, Prefs.VibrateState vibrate) {
|
||||
Uri defaultRingtone = Prefs.getNotificationRingtone(context);
|
||||
boolean defaultVibrate = Prefs.isNotificationVibrateEnabled(context);
|
||||
|
||||
@@ -84,7 +84,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
|
||||
}
|
||||
}
|
||||
|
||||
public void setTicker(@NonNull Recipient recipient, @Nullable CharSequence message) {
|
||||
void setTicker(@NonNull Recipient recipient, @Nullable CharSequence message) {
|
||||
if (privacy.isDisplayMessage()) {
|
||||
setTicker(getStyledMessage(recipient, message));
|
||||
} else if (privacy.isDisplayContact()) {
|
||||
@@ -109,7 +109,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
|
||||
// - the idea is that sound, led, vibrate is edited by the user
|
||||
// via the ACTION_CHANNEL_NOTIFICATION_SETTINGS intent that takes the channelId
|
||||
|
||||
protected String createMsgNotificationChannel(Context context) {
|
||||
static String createMsgNotificationChannel(Context context) {
|
||||
String chBase = "ch_msg2_";
|
||||
String chId = chBase + "unsupported";
|
||||
|
||||
@@ -193,7 +193,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
|
||||
return chId;
|
||||
}
|
||||
|
||||
protected static boolean notificationChannelsSupported() {
|
||||
private static boolean notificationChannelsSupported() {
|
||||
return Build.VERSION.SDK_INT >= 26;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ class MessageNotifier implements IMessageNotifier {
|
||||
private boolean soundInLoaded;
|
||||
private boolean soundOutLoaded;
|
||||
|
||||
protected MessageNotifier(Context context) {
|
||||
MessageNotifier(Context context) {
|
||||
appContext = context.getApplicationContext();
|
||||
soundPool = new SoundPool(3, AudioManager.STREAM_SYSTEM, 0);
|
||||
soundIn = soundPool.load(context, R.raw.sound_in, 1);
|
||||
|
||||
+6
-6
@@ -32,14 +32,14 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
|
||||
final @NonNull Recipient sender;
|
||||
final @NonNull CharSequence message;
|
||||
|
||||
public MessageBody(@Nullable Recipient group, @NonNull Recipient sender, @NonNull CharSequence message) {
|
||||
MessageBody(@Nullable Recipient group, @NonNull Recipient sender, @NonNull CharSequence message) {
|
||||
this.group = group;
|
||||
this.sender = sender;
|
||||
this.message = message;
|
||||
}
|
||||
}
|
||||
|
||||
public MultipleRecipientNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
|
||||
MultipleRecipientNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
|
||||
super(context, privacy);
|
||||
|
||||
setColor(context.getResources().getColor(R.color.delta_primary));
|
||||
@@ -54,21 +54,21 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
|
||||
setGroupSummary(true);
|
||||
}
|
||||
|
||||
public void setMessageCount(int messageCount, int chatCount) {
|
||||
void setMessageCount(int messageCount, int chatCount) {
|
||||
setSubText(context.getString(R.string.notify_n_messages_in_m_chats,
|
||||
messageCount, chatCount));
|
||||
setContentInfo(String.valueOf(messageCount));
|
||||
setNumber(messageCount);
|
||||
}
|
||||
|
||||
public void setMostRecentSender(Recipient recipient) {
|
||||
void setMostRecentSender(Recipient recipient) {
|
||||
if (privacy.isDisplayContact()) {
|
||||
setContentText(context.getString(R.string.notify_most_recent_from,
|
||||
recipient.toShortString()));
|
||||
}
|
||||
}
|
||||
|
||||
public void addActions(PendingIntent markAsReadIntent) {
|
||||
void addActions(PendingIntent markAsReadIntent) {
|
||||
NotificationCompat.Action markAllAsReadAction = new NotificationCompat.Action(R.drawable.check,
|
||||
context.getString(R.string.notify_mark_all_read),
|
||||
markAsReadIntent);
|
||||
@@ -76,7 +76,7 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
|
||||
extend(new NotificationCompat.WearableExtender().addAction(markAllAsReadAction));
|
||||
}
|
||||
|
||||
public void addMessageBody(@Nullable Recipient group, @NonNull Recipient sender, @Nullable CharSequence body) {
|
||||
void addMessageBody(@Nullable Recipient group, @NonNull Recipient sender, @Nullable CharSequence body) {
|
||||
messageBodies.add(new MessageBody(group, sender, body));
|
||||
|
||||
if (privacy.isDisplayContact() && sender.getContactUri() != null) {
|
||||
|
||||
@@ -16,15 +16,15 @@ public class NotificationItem {
|
||||
|
||||
private final int id;
|
||||
private final @NonNull Recipient threadRecipient;
|
||||
private final @Nullable Recipient individualRecipient;
|
||||
private final @NonNull Recipient individualRecipient;
|
||||
private final int chatId;
|
||||
private final @Nullable CharSequence text;
|
||||
private final long timestamp;
|
||||
private final @Nullable SlideDeck slideDeck;
|
||||
|
||||
public NotificationItem(int id,
|
||||
NotificationItem(int id,
|
||||
@NonNull Recipient threadRecipient,
|
||||
@Nullable Recipient individualRecipient,
|
||||
@NonNull Recipient individualRecipient,
|
||||
int chatId, @Nullable CharSequence text, long timestamp,
|
||||
@Nullable SlideDeck slideDeck)
|
||||
{
|
||||
@@ -57,7 +57,7 @@ public class NotificationItem {
|
||||
return chatId;
|
||||
}
|
||||
|
||||
public @NonNull Recipient getIndividualRecipient() {
|
||||
@NonNull Recipient getIndividualRecipient() {
|
||||
return individualRecipient;
|
||||
}
|
||||
|
||||
@@ -66,11 +66,11 @@ public class NotificationItem {
|
||||
return chatId;
|
||||
}
|
||||
|
||||
public @Nullable SlideDeck getSlideDeck() {
|
||||
@Nullable SlideDeck getSlideDeck() {
|
||||
return slideDeck;
|
||||
}
|
||||
|
||||
public @NonNull PendingIntent getPendingIntent(Context context) {
|
||||
@NonNull PendingIntent getPendingIntent(Context context) {
|
||||
Intent intent = new Intent(context, ConversationActivity.class);
|
||||
|
||||
intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
|
||||
|
||||
+5
-5
@@ -46,7 +46,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
|
||||
private CharSequence contentTitle;
|
||||
private CharSequence contentText;
|
||||
|
||||
public SingleRecipientNotificationBuilder(@NonNull Context context, @NonNull NotificationPrivacyPreference privacy)
|
||||
SingleRecipientNotificationBuilder(@NonNull Context context, @NonNull NotificationPrivacyPreference privacy)
|
||||
{
|
||||
super(context, privacy);
|
||||
|
||||
@@ -117,7 +117,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
|
||||
}
|
||||
}
|
||||
|
||||
public void addActions(@NonNull PendingIntent markReadIntent,
|
||||
void addActions(@NonNull PendingIntent markReadIntent,
|
||||
@NonNull PendingIntent compatInNotificationReplyIntent,
|
||||
@NonNull PendingIntent inNotificationReplyIntent)
|
||||
{
|
||||
@@ -153,7 +153,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
|
||||
.addAction(wearableReplyAction));
|
||||
}
|
||||
|
||||
public void addMessageBody(@NonNull Recipient chatRecipient,
|
||||
void addMessageBody(@NonNull Recipient chatRecipient,
|
||||
@NonNull Recipient individualRecipient,
|
||||
@Nullable CharSequence messageBody)
|
||||
{
|
||||
@@ -174,9 +174,9 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
|
||||
public Notification build() {
|
||||
// the filtering whether or not to display messages and contacts is done in addMessageBody
|
||||
// and setPrimaryMessageBody, no need to do it here again.
|
||||
NotificationCompat.Style style = new NotificationCompat.InboxStyle();
|
||||
NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle();
|
||||
for (CharSequence messageBody : messageBodies) {
|
||||
((NotificationCompat.InboxStyle) style).addLine(messageBody);
|
||||
style.addLine(messageBody);
|
||||
}
|
||||
setStyle(style);
|
||||
return super.build();
|
||||
|
||||
Reference in New Issue
Block a user