Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-14 13:03:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash

Browse Source
This commit is contained in:
M66B
2020-03-11 11:07:31 +01:00
parent 23c0263eb0
commit c37158495d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@@ -188,10 +188,10 @@ public class ServiceSend extends ServiceBase {
.setCategory(NotificationCompat.CATEGORY_SERVICE)
.setVisibility(NotificationCompat.VISIBILITY_SECRET);
if (lastUnsent != null)
if (lastUnsent != null && lastUnsent.count != null)
builder.setContentText(getResources().getQuantityString(
R.plurals.title_notification_unsent, lastUnsent.count, lastUnsent.count));
if (lastUnsent == null || lastUnsent.busy == 0)
if (lastUnsent == null || lastUnsent.busy == null || lastUnsent.busy == 0)
builder.setSubText(getString(R.string.title_notification_idle));
if (!lastSuitable)
builder.setSubText(getString(R.string.title_notification_waiting));

6
app/src/main/java/eu/faircode/email/TupleUnsent.java
View File

@@ -21,6 +21,8 @@ package eu.faircode.email;
import androidx.annotation.Nullable;
import java.util.Objects;
public class TupleUnsent {
public Integer count;
public Integer busy;
@@ -29,8 +31,8 @@ public class TupleUnsent {
public boolean equals(@Nullable Object obj) {
if (obj instanceof TupleUnsent) {
TupleUnsent other = (TupleUnsent) obj;
return (this.count.equals(other.count) &&
this.busy.equals(other.busy));
return (Objects.equals(this.count, other.count) &&
Objects.equals(this.busy, other.busy));
} else
return false;
}