diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 78ced9520..3c076e77a 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -2545,7 +2545,7 @@ public abstract class BaseMainActivity extends BaseActivity TextView actionView = item.getActionView().findViewById(R.id.counter); if(actionView != null) { if (unread > 0) { - actionView.setText(unread); + actionView.setText(String.valueOf(unread)); actionView.setVisibility(View.VISIBLE); }else{ actionView.setVisibility(View.GONE); diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java index f9585cd74..876c44fc1 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -620,22 +620,13 @@ public class API { if( resobj.getString("ends_at").compareTo("null") != 0) { announcement.setEndAt(Helper.mstStringToDate(context, resobj.getString("ends_at"))); } + + announcement.setRead(resobj.getBoolean("read")); announcement.setReactions(parseReaction(resobj.getJSONArray("reactions"))); - List mentions = new ArrayList<>(); - JSONArray arrayMention = resobj.getJSONArray("mentions"); - for (int j = 0; j < arrayMention.length(); j++) { - JSONObject menObj = arrayMention.getJSONObject(j); - Mention mention = new Mention(); - mention.setId(menObj.get("id").toString()); - mention.setUrl(menObj.get("url").toString()); - mention.setAcct(menObj.get("acct").toString()); - mention.setUsername(menObj.get("username").toString()); - mentions.add(mention); - } - announcement.setMentions(mentions); + List tags = new ArrayList<>(); JSONArray arrayTag = resobj.getJSONArray("tags"); @@ -661,6 +652,23 @@ public class API { announcement.setEmojis(new ArrayList<>()); } + List mentions = new ArrayList<>(); + try { + JSONArray arrayMention = resobj.getJSONArray("mentions"); + for (int j = 0; j < arrayMention.length(); j++) { + JSONObject menObj = arrayMention.getJSONObject(j); + Mention mention = new Mention(); + mention.setId(menObj.get("id").toString()); + mention.setUrl(menObj.get("url").toString()); + mention.setAcct(menObj.get("acct").toString()); + mention.setUsername(menObj.get("username").toString()); + mentions.add(mention); + } + announcement.setMentions(mentions); + } catch (Exception e) { + announcement.setMentions(new ArrayList<>()); + } + } catch (JSONException | ParseException e) { e.printStackTrace(); } diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index f685a58af..cee467115 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -1692,6 +1692,9 @@ public class Helper { MenuItem nav_trends = menu.findItem(R.id.nav_trends); if (nav_trends != null) nav_trends.setVisible(false); + MenuItem nav_announcements = menu.findItem(R.id.nav_announcements); + if (nav_announcements != null) + nav_announcements.setVisible(false); MenuItem nav_peertube = menu.findItem(R.id.nav_peertube); if (nav_peertube != null) nav_peertube.setVisible(false);