bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unread badge for archive

Browse Source
This commit is contained in:
Christian Basler 2017-04-21 07:23:39 +02:00
parent 30c5bf6b90
commit 91cc90ec04
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/ch/dissem/apps/abit/MainActivity.java
View File

@ -78,6 +78,7 @@ import ch.dissem.bitmessage.entity.valueobject.Label;
import static android.widget.Toast.LENGTH_LONG; import static android.widget.Toast.LENGTH_LONG;
import static ch.dissem.apps.abit.ComposeMessageActivity.launchReplyTo; import static ch.dissem.apps.abit.ComposeMessageActivity.launchReplyTo;
import static ch.dissem.apps.abit.repository.AndroidMessageRepository.LABEL_ARCHIVE;
import static ch.dissem.apps.abit.service.BitmessageService.isRunning; import static ch.dissem.apps.abit.service.BitmessageService.isRunning;
@ -321,7 +322,7 @@ public class MainActivity extends AppCompatActivity
final ArrayList<IDrawerItem> drawerItems = new ArrayList<>(); final ArrayList<IDrawerItem> drawerItems = new ArrayList<>();
drawerItems.add(new PrimaryDrawerItem() drawerItems.add(new PrimaryDrawerItem()
.withName(R.string.archive) .withName(R.string.archive)
.withTag(AndroidMessageRepository.LABEL_ARCHIVE) .withTag(LABEL_ARCHIVE)
.withIcon(CommunityMaterial.Icon.cmd_archive) .withIcon(CommunityMaterial.Icon.cmd_archive)
); );
drawerItems.add(new DividerDrawerItem()); drawerItems.add(new DividerDrawerItem());
@ -533,13 +534,15 @@ public class MainActivity extends AppCompatActivity
for (IDrawerItem item : drawer.getDrawerItems()) { for (IDrawerItem item : drawer.getDrawerItems()) {
if (item.getTag() instanceof Label) { if (item.getTag() instanceof Label) {
Label label = (Label) item.getTag(); Label label = (Label) item.getTag();
int unread = bmc.messages().countUnread(label); if (label != LABEL_ARCHIVE) {
if (unread > 0) { int unread = bmc.messages().countUnread(label);
((PrimaryDrawerItem) item).withBadge(String.valueOf(unread)); if (unread > 0) {
} else { ((PrimaryDrawerItem) item).withBadge(String.valueOf(unread));
((PrimaryDrawerItem) item).withBadge((String) null); } else {
((PrimaryDrawerItem) item).withBadge((String) null);
}
drawer.updateItem(item);
} }
drawer.updateItem(item);
} }
} }
} }