|
|
@ -977,7 +977,13 @@ public class FragmentMessages extends FragmentBase
|
|
|
|
if (!ch && !dh)
|
|
|
|
if (!ch && !dh)
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
|
|
|
|
|
|
|
|
if (pos > 0) {
|
|
|
|
if (EntityMessage.PRIORITIY_HIGH.equals(message.importance)) {
|
|
|
|
|
|
|
|
if (pos > 0)
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
} else if (EntityMessage.PRIORITIY_LOW.equals(message.importance)) {
|
|
|
|
|
|
|
|
if (EntityMessage.PRIORITIY_LOW.equals(prev.importance))
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
} else if (pos > 0) {
|
|
|
|
Calendar cal0 = Calendar.getInstance();
|
|
|
|
Calendar cal0 = Calendar.getInstance();
|
|
|
|
Calendar cal1 = Calendar.getInstance();
|
|
|
|
Calendar cal1 = Calendar.getInstance();
|
|
|
|
cal0.setMinimalDaysInFirstWeek(4); // ISO 8601
|
|
|
|
cal0.setMinimalDaysInFirstWeek(4); // ISO 8601
|
|
|
@ -1024,9 +1030,14 @@ public class FragmentMessages extends FragmentBase
|
|
|
|
vSeparator.setVisibility(View.GONE);
|
|
|
|
vSeparator.setVisibility(View.GONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tvDate.setText(date_week
|
|
|
|
if (EntityMessage.PRIORITIY_HIGH.equals(message.importance))
|
|
|
|
? getWeek(message.received, parent.getContext())
|
|
|
|
tvDate.setText(R.string.title_is_important);
|
|
|
|
: getRelativeDate(message.received, parent.getContext()));
|
|
|
|
else if (EntityMessage.PRIORITIY_LOW.equals(message.importance))
|
|
|
|
|
|
|
|
tvDate.setText(R.string.title_is_not_important);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
tvDate.setText(date_week
|
|
|
|
|
|
|
|
? getWeek(message.received, parent.getContext())
|
|
|
|
|
|
|
|
: getRelativeDate(message.received, parent.getContext()));
|
|
|
|
|
|
|
|
|
|
|
|
view.setContentDescription(tvDate.getText().toString());
|
|
|
|
view.setContentDescription(tvDate.getText().toString());
|
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
|
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
|
|
|
|