Fix a few crashes

irccloud · Sep 25, 2015 · f61d741 · f61d741
1 parent 09dcbd2
commit f61d741
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
@@ -1794,7 +1794,8 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("set_ignores", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                mServers.getServer(object.cid()).updateIgnores(object.getJsonNode("masks"));
+                if(mServers.getServer(object.cid()) != null)
+                    mServers.getServer(object.cid()).updateIgnores(object.getJsonNode("masks"));
                 if (!backlog)
                     notifyHandlers(EVENT_SETIGNORES, object);
             }
@@ -2452,7 +2453,8 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
             public void parse(IRCCloudJSONObject object) throws JSONException {
                 if (!backlog) {
                     mUsers.updateAwayMsg(object.bid(), object.getString("nick"), 1, object.getString("away_msg"));
-                    mServers.getServer(object.cid()).setAway(object.getString("away_msg"));
+                    if(mServers.getServer(object.cid()) != null)
+                        mServers.getServer(object.cid()).setAway(object.getString("away_msg"));
                     notifyHandlers(EVENT_AWAY, object);
                 }
             }
@@ -2606,11 +2608,11 @@ private synchronized void parse_object(IRCCloudJSONObject object) throws JSONExc
             }
             if((!backlog || numbuffers > 0) && object.eid() > highest_eid) {
                 highest_eid = object.eid();
-                if(!backlog) {
+                /*if(!backlog) {
                     SharedPreferences.Editor editor = IRCCloudApplication.getInstance().getApplicationContext().getSharedPreferences("prefs", 0).edit();
                     editor.putLong("highest_eid", highest_eid);
                     editor.apply();
-                }
+                }*/
             }
         }
 

diff --git a/src/com/irccloud/android/activity/MainActivity.java b/src/com/irccloud/android/activity/MainActivity.java
@@ -3199,7 +3199,8 @@ public void onClick(DialogInterface dialogInterface, int item) {
                     BuffersListFragment blf = (BuffersListFragment) getSupportFragmentManager().findFragmentById(R.id.BuffersList);
                     if (blf != null)
                         blf.refresh();
-                    conn.heartbeat(buffer.getBid(), cids.toArray(new Integer[cids.size()]), bids.toArray(new Integer[bids.size()]), eids.toArray(new Long[eids.size()]));
+                    if(conn != null && buffer != null)
+                        conn.heartbeat(buffer.getBid(), cids.toArray(new Integer[cids.size()]), bids.toArray(new Integer[bids.size()]), eids.toArray(new Long[eids.size()]));
                 } else if (items[item].equals("Delete")) {
                     builder = new AlertDialog.Builder(MainActivity.this);
                     builder.setInverseBackgroundForced(Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB);

diff --git a/src/com/irccloud/android/data/collection/NotificationsList.java b/src/com/irccloud/android/data/collection/NotificationsList.java
@@ -115,6 +115,9 @@ public void clearLastSeenEIDs() {
     }
 
     public long getLastSeenEid(int bid) {
+        Buffer b = BuffersList.getInstance().getBuffer(bid);
+        if(b != null)
+            return b.getLast_seen_eid();
         synchronized (dbLock) {
             Notification_LastSeenEID eid = new Select().from(Notification_LastSeenEID.class).where(Condition.column(Notification_LastSeenEID$Table.BID).is(bid)).querySingle();
             if (eid != null)
@@ -178,8 +181,11 @@ public void deleteOldNotifications() {
 
         if (notifications.size() > 0) {
             for (Notification n : notifications) {
+                long last_seen_eid = getLastSeenEid(n.bid);
                 Buffer b = BuffersList.getInstance().getBuffer(n.bid);
-                if (n.bid == b.getBid() && n.eid <= b.getLast_seen_eid()) {
+                if(b != null)
+                    last_seen_eid = b.getLast_seen_eid();
+                if (n.eid <= last_seen_eid) {
                     NotificationManagerCompat.from(IRCCloudApplication.getInstance().getApplicationContext()).cancel((int) (n.eid / 1000));
                     changed = true;
                     try {
@@ -194,8 +200,11 @@ public void deleteOldNotifications() {
         notifications = getNotifications();
 
         for (Notification n : notifications) {
+            long last_seen_eid = getLastSeenEid(n.bid);
             Buffer b = BuffersList.getInstance().getBuffer(n.bid);
-            if (b != null && n.bid == b.getBid() && n.eid <= b.getLast_seen_eid()) {
+            if(b != null)
+                last_seen_eid = b.getLast_seen_eid();
+            if (n.eid <= last_seen_eid) {
                 n.delete();
                 NotificationManagerCompat.from(IRCCloudApplication.getInstance().getApplicationContext()).cancel(n.bid);
                 NotificationManagerCompat.from(IRCCloudApplication.getInstance().getApplicationContext()).cancel((int) (n.eid / 1000));