From 11361af4524e4f3a8d1426c635adbb7b5da2efc6 Mon Sep 17 00:00:00 2001
From: Sam Steele <sam.steele@gmail.com>
Date: Sun, 28 Jun 2015 09:08:08 -0700
Subject: [PATCH] Update to Android Studio 1.3 and Gradle Wrapper 2.4 + small
 optimization to backlog loading / rendering

---
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |  24 +++
 .idea/runConfigurations.xml                   |  12 ++
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 irccloud-android.iml                          |   6 +-
 .../android/IRCCloudApplicationBase.java      |  10 -
 .../irccloud/android/NetworkConnection.java   | 190 +++++++++---------
 .../android/data/BuffersDataSource.java       |   4 +-
 .../android/data/ChannelsDataSource.java      |   2 +-
 .../android/data/EventsDataSource.java        |   2 +-
 .../android/data/ServersDataSource.java       |   2 +-
 .../android/data/UsersDataSource.java         |   2 +-
 .../android/fragment/BuffersListFragment.java |   2 +-
 .../android/fragment/MessageViewFragment.java |  10 +-
 .../android/fragment/UsersListFragment.java   |   2 +-
 15 files changed, 153 insertions(+), 119 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 925325b49..6746e1b46 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2e537bc42..4d8d8ef71 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,30 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 000000000..7f68460d8
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c07716ef2..1666b6af1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/irccloud-android.iml b/irccloud-android.iml
index d39776949..62a5e09c7 100644
--- a/irccloud-android.iml
+++ b/irccloud-android.iml
@@ -12,13 +12,15 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debugTest" />
     <exclude-output />
diff --git a/src/com/irccloud/android/IRCCloudApplicationBase.java b/src/com/irccloud/android/IRCCloudApplicationBase.java
index 1219bb082..3fbaa8d4f 100644
--- a/src/com/irccloud/android/IRCCloudApplicationBase.java
+++ b/src/com/irccloud/android/IRCCloudApplicationBase.java
@@ -47,11 +47,6 @@ public class IRCCloudApplicationBase extends Application {
     private static final int RINGTONE_VERSION = 1;
 
     private NetworkConnection conn = null;
-    private ServersDataSource s = null;
-    private BuffersDataSource b = null;
-    private ChannelsDataSource c = null;
-    private UsersDataSource u = null;
-    private EventsDataSource e = null;
 
     @Override
     public void onCreate() {
@@ -65,11 +60,6 @@ public void onCreate() {
 
         //Allocate all the shared objects at launch
         conn = NetworkConnection.getInstance();
-        s = ServersDataSource.getInstance();
-        b = BuffersDataSource.getInstance();
-        c = ChannelsDataSource.getInstance();
-        u = UsersDataSource.getInstance();
-        e = EventsDataSource.getInstance();
         ColorFormatter.init();
 
         if (prefs.contains("notify")) {
diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
index e4553e8e3..d65544849 100644
--- a/src/com/irccloud/android/NetworkConnection.java
+++ b/src/com/irccloud/android/NetworkConnection.java
@@ -100,6 +100,12 @@ public class NetworkConnection {
     private static final String TAG = "IRCCloud";
     private static NetworkConnection instance = null;
 
+    private static final ServersDataSource mServers = ServersDataSource.getInstance();
+    private static final BuffersDataSource mBuffers = BuffersDataSource.getInstance();
+    private static final ChannelsDataSource mChannels = ChannelsDataSource.getInstance();
+    private static final UsersDataSource mUsers = UsersDataSource.getInstance();
+    private static final EventsDataSource mEvents = EventsDataSource.getInstance();
+
     public static final int WEBSOCKET_TAG = 0x50C37;
     public static final int BACKLOG_TAG = 0xB4C106;
 
@@ -549,9 +555,9 @@ public void disconnect() {
         }
         oobTasks.clear();
         session = null;
-        for (BuffersDataSource.Buffer b : BuffersDataSource.getInstance().getBuffers()) {
+        for (BuffersDataSource.Buffer b : mBuffers.getBuffers()) {
             if (!b.scrolledUp)
-                EventsDataSource.getInstance().pruneEvents(b.bid);
+                mEvents.pruneEvents(b.bid);
         }
     }
 
@@ -904,8 +910,8 @@ public synchronized void connect(String sk) {
         );
 
         String url = "wss://" + IRCCLOUD_HOST + IRCCLOUD_PATH;
-        if (EventsDataSource.getInstance().highest_eid > 0) {
-            url += "?since_id=" + EventsDataSource.getInstance().highest_eid;
+        if (mEvents.highest_eid > 0) {
+            url += "?since_id=" + mEvents.highest_eid;
             if (streamId != null && streamId.length() > 0)
                 url += "&stream_id=" + streamId;
         }
@@ -1048,11 +1054,11 @@ public void logout() {
         SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(IRCCloudApplication.getInstance().getApplicationContext()).edit();
         prefs.clear();
         prefs.commit();
-        ServersDataSource.getInstance().clear();
-        BuffersDataSource.getInstance().clear();
-        ChannelsDataSource.getInstance().clear();
-        UsersDataSource.getInstance().clear();
-        EventsDataSource.getInstance().clear();
+        mServers.clear();
+        mBuffers.clear();
+        mChannels.clear();
+        mUsers.clear();
+        mEvents.clear();
         Notifications.getInstance().clearNetworks();
         Notifications.getInstance().clear();
         userInfo = null;
@@ -1631,7 +1637,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                     prefs.putBoolean("pastebin-disableprompt", true);
                 }
                 prefs.commit();
-                EventsDataSource.getInstance().clearCaches();
+                mEvents.clearCaches();
                 notifyHandlers(EVENT_USERINFO, userInfo);
             }
         });
@@ -1639,7 +1645,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("set_ignores", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 s.updateIgnores(object.cid(), object.getJsonNode("masks"));
                 if (!backlog)
                     notifyHandlers(EVENT_SETIGNORES, object);
@@ -1659,11 +1665,11 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                         Map.Entry<String, JsonNode> eidentry = j.next();
                         int bid = Integer.valueOf(eidentry.getKey());
                         long eid = eidentry.getValue().asLong();
-                        BuffersDataSource.getInstance().updateLastSeenEid(bid, eid);
+                        mBuffers.updateLastSeenEid(bid, eid);
                         Notifications.getInstance().deleteOldNotifications(bid, eid);
                         Notifications.getInstance().updateLastSeenEid(bid, eid);
-                        if (EventsDataSource.getInstance().lastEidForBuffer(bid) <= eid) {
-                            BuffersDataSource.Buffer b = BuffersDataSource.getInstance().getBuffer(bid);
+                        if (mEvents.lastEidForBuffer(bid) <= eid) {
+                            BuffersDataSource.Buffer b = mBuffers.getBuffer(bid);
                             if (b != null) {
                                 b.unread = 0;
                                 b.highlights = 0;
@@ -1712,12 +1718,12 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                 accrued = 0;
                 backlog = false;
                 Log.d("IRCCloud", "Cleaning up invalid BIDs");
-                BuffersDataSource.getInstance().purgeInvalidBIDs();
-                ChannelsDataSource.getInstance().purgeInvalidChannels();
-                for (BuffersDataSource.Buffer b : BuffersDataSource.getInstance().getBuffers()) {
+                mBuffers.purgeInvalidBIDs();
+                mChannels.purgeInvalidChannels();
+                for (BuffersDataSource.Buffer b : mBuffers.getBuffers()) {
                     Notifications.getInstance().deleteOldNotifications(b.bid, b.last_seen_eid);
                 }
-                if (userInfo.connections > 0 && (ServersDataSource.getInstance().count() == 0 || BuffersDataSource.getInstance().count() == 0)) {
+                if (userInfo.connections > 0 && (mServers.count() == 0 || mBuffers.count() == 0)) {
                     Log.e("IRCCloud", "Failed to load buffers list, reconnecting");
                     notifyHandlers(EVENT_BACKLOG_FAILED, null);
                     streamId = null;
@@ -1785,7 +1791,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("makeserver", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 String away = object.getString("away");
                 if (getUserInfo() != null && getUserInfo().auto_away && away.equals("Auto-away"))
                     away = "";
@@ -1808,7 +1814,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("connection_deleted", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 s.deleteAllDataForServer(object.cid());
                 Notifications.getInstance().deleteNetwork(object.cid());
                 if (!backlog)
@@ -1818,13 +1824,13 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("status_changed", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 s.updateStatus(object.cid(), object.getString("new_status"), object.getJsonObject("fail_info"));
                 if (!backlog) {
                     if (object.getString("new_status").equals("disconnected")) {
-                        ArrayList<BuffersDataSource.Buffer> buffers = BuffersDataSource.getInstance().getBuffersForServer(object.cid());
+                        ArrayList<BuffersDataSource.Buffer> buffers = mBuffers.getBuffersForServer(object.cid());
                         for (BuffersDataSource.Buffer b : buffers) {
-                            ChannelsDataSource.getInstance().deleteChannel(b.bid);
+                            mChannels.deleteChannel(b.bid);
                         }
                     }
                     notifyHandlers(EVENT_STATUSCHANGED, object);
@@ -1834,7 +1840,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("connection_lag", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 s.updateLag(object.cid(), object.getLong("lag"));
                 if (!backlog)
                     notifyHandlers(EVENT_CONNECTIONLAG, object);
@@ -1843,7 +1849,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("isupport_params", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 s.updateUserModes(object.cid(), object.getString("usermodes"));
                 s.updateIsupport(object.cid(), object.getJsonObject("params"));
             }
@@ -1851,7 +1857,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("reorder_connections", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 JsonNode order = object.getJsonNode("order");
                 for (int i = 0; i < order.size(); i++) {
                     ServersDataSource.Server server = s.getServer(order.get(i).asInt());
@@ -1866,14 +1872,14 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("makebuffer", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
                 BuffersDataSource.Buffer buffer = b.createBuffer(object.bid(), object.cid(),
                         (object.has("min_eid") && !object.getString("min_eid").equalsIgnoreCase("undefined")) ? object.getLong("min_eid") : 0,
                         (object.has("last_seen_eid") && !object.getString("last_seen_eid").equalsIgnoreCase("undefined")) ? object.getLong("last_seen_eid") : -1, object.getString("name"), object.getString("buffer_type"),
                         (object.has("archived") && object.getBoolean("archived")) ? 1 : 0, (object.has("deferred") && object.getBoolean("deferred")) ? 1 : 0, (object.has("timeout") && object.getBoolean("timeout")) ? 1 : 0);
                 Notifications.getInstance().deleteOldNotifications(buffer.bid, buffer.last_seen_eid);
                 Notifications.getInstance().updateLastSeenEid(buffer.bid, buffer.last_seen_eid);
-                if (EventsDataSource.getInstance().lastEidForBuffer(buffer.bid) <= buffer.last_seen_eid) {
+                if (mEvents.lastEidForBuffer(buffer.bid) <= buffer.last_seen_eid) {
                     buffer.unread = 0;
                     buffer.highlights = 0;
                 }
@@ -1885,7 +1891,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("delete_buffer", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
                 b.deleteAllDataForBuffer(object.bid());
                 Notifications.getInstance().deleteNotificationsForBid(object.bid());
                 if (!backlog)
@@ -1895,7 +1901,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("buffer_archived", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
                 b.updateArchived(object.bid(), 1);
                 if (!backlog)
                     notifyHandlers(EVENT_BUFFERARCHIVED, object.bid());
@@ -1904,7 +1910,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("buffer_unarchived", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
                 b.updateArchived(object.bid(), 0);
                 if (!backlog)
                     notifyHandlers(EVENT_BUFFERUNARCHIVED, object.bid());
@@ -1913,7 +1919,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("rename_conversation", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
                 b.updateName(object.bid(), object.getString("new_name"));
                 if (!backlog)
                     notifyHandlers(EVENT_RENAMECONVERSATION, object.bid());
@@ -1922,10 +1928,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         Parser msg = new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 boolean newEvent = (e.getEvent(object.eid(), object.bid()) == null);
                 EventsDataSource.Event event = e.addEvent(object);
-                BuffersDataSource.Buffer b = BuffersDataSource.getInstance().getBuffer(object.bid());
+                BuffersDataSource.Buffer b = mBuffers.getBuffer(object.bid());
 
                 if (b != null && event.eid > b.last_seen_eid && event.isImportant(b.type)) {
                     if ((event.highlight || b.type.equals("conversation"))) {
@@ -1956,7 +1962,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                                         break;
                                     case "console":
                                         if (event.from == null || event.from.length() == 0) {
-                                            ServersDataSource.Server s = ServersDataSource.getInstance().getServer(event.cid);
+                                            ServersDataSource.Server s = mServers.getServer(event.cid);
                                             if (s.name != null && s.name.length() > 0)
                                                 Notifications.getInstance().showNotifications(s.name + ": " + message);
                                             else
@@ -1985,11 +1991,11 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                         client.disconnect();
                 }
 
-                if (handlers.size() == 0 && b != null && !b.scrolledUp && EventsDataSource.getInstance().getSizeOfBuffer(b.bid) > 200)
-                    EventsDataSource.getInstance().pruneEvents(b.bid);
+                if (handlers.size() == 0 && b != null && !b.scrolledUp && mEvents.getSizeOfBuffer(b.bid) > 200)
+                    mEvents.pruneEvents(b.bid);
 
                 if (event.reqid >= 0) {
-                    EventsDataSource.Event pending = EventsDataSource.getInstance().findPendingEventForReqid(event.bid, event.reqid);
+                    EventsDataSource.Event pending = mEvents.findPendingEventForReqid(event.bid, event.reqid);
                     if(pending != null) {
                         try {
                             if (pending.expiration_timer != null)
@@ -1998,10 +2004,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                             //Timer already cancelled
                         }
                         if(pending.eid != event.eid)
-                            EventsDataSource.getInstance().deleteEvent(pending.eid, pending.bid);
+                            mEvents.deleteEvent(pending.eid, pending.bid);
                     }
                 } else if(event.self && b != null && b.type.equals("conversation")) {
-                    EventsDataSource.getInstance().clearPendingEvents(event.bid);
+                    mEvents.clearPendingEvents(event.bid);
                 }
 
                 if (!backlog)
@@ -2104,7 +2110,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("link_channel", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog)
                     notifyHandlers(EVENT_LINKCHANNEL, object);
@@ -2113,21 +2119,21 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("channel_init", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ChannelsDataSource c = ChannelsDataSource.getInstance();
+                ChannelsDataSource c = mChannels;
                 ChannelsDataSource.Channel channel = c.createChannel(object.cid(), object.bid(), object.getString("chan"),
                         object.getJsonObject("topic").get("text").isNull() ? "" : object.getJsonObject("topic").get("text").asText(),
                         object.getJsonObject("topic").get("time").asLong(),
                         object.getJsonObject("topic").has("nick") ? object.getJsonObject("topic").get("nick").asText() : object.getJsonObject("topic").get("server").asText(), object.getString("channel_type"),
                         object.getLong("timestamp"));
                 c.updateMode(object.bid(), object.getString("mode"), object.getJsonObject("ops"), true);
-                UsersDataSource u = UsersDataSource.getInstance();
+                UsersDataSource u = mUsers;
                 u.deleteUsersForBuffer(object.bid());
                 JsonNode users = object.getJsonNode("members");
                 for (int i = 0; i < users.size(); i++) {
                     JsonNode user = users.get(i);
                     u.createUser(object.cid(), object.bid(), user.get("nick").asText(), user.get("usermask").asText(), user.get("mode").asText(), user.get("away").asBoolean() ? 1 : 0, false);
                 }
-                BuffersDataSource.getInstance().dirty = true;
+                mBuffers.dirty = true;
                 if (!backlog)
                     notifyHandlers(EVENT_CHANNELINIT, channel);
             }
@@ -2135,10 +2141,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("channel_topic", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    ChannelsDataSource c = ChannelsDataSource.getInstance();
+                    ChannelsDataSource c = mChannels;
                     c.updateTopic(object.bid(), object.getString("topic"), object.getLong("eid") / 1000000, object.has("author") ? object.getString("author") : object.getString("server"));
                     notifyHandlers(EVENT_CHANNELTOPIC, object);
                 }
@@ -2147,17 +2153,17 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("channel_url", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ChannelsDataSource c = ChannelsDataSource.getInstance();
+                ChannelsDataSource c = mChannels;
                 c.updateURL(object.bid(), object.getString("url"));
             }
         });
         put("channel_mode", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    ChannelsDataSource c = ChannelsDataSource.getInstance();
+                    ChannelsDataSource c = mChannels;
                     c.updateMode(object.bid(), object.getString("newmode"), object.getJsonObject("ops"), false);
                     notifyHandlers(EVENT_CHANNELMODE, object);
                 }
@@ -2168,7 +2174,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
                 if (!backlog) {
-                    ChannelsDataSource c = ChannelsDataSource.getInstance();
+                    ChannelsDataSource c = mChannels;
                     c.updateTimestamp(object.bid(), object.getLong("timestamp"));
                     notifyHandlers(EVENT_CHANNELTIMESTAMP, object);
                 }
@@ -2177,10 +2183,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("joined_channel", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.createUser(object.cid(), object.bid(), object.getString("nick"), object.getString("hostmask"), "", 0);
                     notifyHandlers(EVENT_JOIN, object);
                 }
@@ -2190,16 +2196,16 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("parted_channel", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.deleteUser(object.bid(), object.getString("nick"));
                     if (object.type().equals("you_parted_channel")) {
-                        ChannelsDataSource c = ChannelsDataSource.getInstance();
+                        ChannelsDataSource c = mChannels;
                         c.deleteChannel(object.bid());
                         u.deleteUsersForBuffer(object.bid());
-                        BuffersDataSource.getInstance().dirty = true;
+                        mBuffers.dirty = true;
                     }
                     notifyHandlers(EVENT_PART, object);
                 }
@@ -2209,10 +2215,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("quit", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.deleteUser(object.bid(), object.getString("nick"));
                     notifyHandlers(EVENT_QUIT, object);
                 }
@@ -2221,7 +2227,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("quit_server", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog)
                     notifyHandlers(EVENT_QUIT, object);
@@ -2230,16 +2236,16 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("kicked_channel", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.deleteUser(object.bid(), object.getString("nick"));
                     if (object.type().equals("you_kicked_channel")) {
-                        ChannelsDataSource c = ChannelsDataSource.getInstance();
+                        ChannelsDataSource c = mChannels;
                         c.deleteChannel(object.bid());
                         u.deleteUsersForBuffer(object.bid());
-                        BuffersDataSource.getInstance().dirty = true;
+                        mBuffers.dirty = true;
                     }
                     notifyHandlers(EVENT_KICK, object);
                 }
@@ -2251,13 +2257,13 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("nickchange", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.updateNick(object.bid(), object.getString("oldnick"), object.getString("newnick"));
                     if (object.type().equals("you_nickchange")) {
-                        ServersDataSource.getInstance().updateNick(object.cid(), object.getString("newnick"));
+                        mServers.updateNick(object.cid(), object.getString("newnick"));
                     }
                     notifyHandlers(EVENT_NICKCHANGE, object);
                 }
@@ -2267,10 +2273,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("user_channel_mode", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.updateMode(object.bid(), object.getString("nick"), object.getString("newmode"));
                     notifyHandlers(EVENT_USERCHANNELMODE, object);
                 }
@@ -2284,7 +2290,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
                 while (i.hasNext()) {
                     Map.Entry<String, JsonNode> e = i.next();
                     JsonNode user = e.getValue();
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    UsersDataSource u = mUsers;
                     u.updateAway(object.bid(), user.get("nick").asText(), user.get("away").asBoolean() ? 1 : 0);
                     u.updateHostmask(object.bid(), user.get("nick").asText(), user.get("usermask").asText());
                 }
@@ -2295,8 +2301,8 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("user_away", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
-                UsersDataSource u = UsersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
+                UsersDataSource u = mUsers;
                 u.updateAwayMsg(object.bid(), object.getString("nick"), 1, object.getString("msg"));
                 b.updateAway(object.cid(), object.getString("nick"), object.getString("msg"));
                 if (!backlog)
@@ -2307,8 +2313,8 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("user_back", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource b = BuffersDataSource.getInstance();
-                UsersDataSource u = UsersDataSource.getInstance();
+                BuffersDataSource b = mBuffers;
+                UsersDataSource u = mUsers;
                 u.updateAwayMsg(object.bid(), object.getString("nick"), 0, "");
                 b.updateAway(object.cid(), object.getString("nick"), "");
                 if (!backlog)
@@ -2319,8 +2325,8 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
                 if (!backlog) {
-                    ServersDataSource s = ServersDataSource.getInstance();
-                    UsersDataSource u = UsersDataSource.getInstance();
+                    ServersDataSource s = mServers;
+                    UsersDataSource u = mUsers;
                     u.updateAwayMsg(object.bid(), object.getString("nick"), 1, object.getString("away_msg"));
                     s.updateAway(object.cid(), object.getString("away_msg"));
                     notifyHandlers(EVENT_AWAY, object);
@@ -2330,8 +2336,8 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("self_back", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
-                UsersDataSource u = UsersDataSource.getInstance();
+                ServersDataSource s = mServers;
+                UsersDataSource u = mUsers;
                 u.updateAwayMsg(object.bid(), object.getString("nick"), 0, "");
                 s.updateAway(object.cid(), "");
                 if (!backlog)
@@ -2341,9 +2347,9 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("self_details", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                ServersDataSource s = ServersDataSource.getInstance();
+                ServersDataSource s = mServers;
                 s.updateUsermask(object.cid(), object.getString("usermask"));
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog)
                     notifyHandlers(EVENT_SELFDETAILS, object);
@@ -2352,10 +2358,10 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("user_mode", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource e = EventsDataSource.getInstance();
+                EventsDataSource e = mEvents;
                 e.addEvent(object);
                 if (!backlog) {
-                    ServersDataSource s = ServersDataSource.getInstance();
+                    ServersDataSource s = mServers;
                     s.updateMode(object.cid(), object.getString("newmode"));
                     notifyHandlers(EVENT_USERMODE, object);
                 }
@@ -2378,9 +2384,9 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
                 if (!backlog) {
-                    BuffersDataSource.Buffer b = BuffersDataSource.getInstance().getBufferByName(object.cid(), object.getString("subject"));
+                    BuffersDataSource.Buffer b = mBuffers.getBufferByName(object.cid(), object.getString("subject"));
                     if (b != null) {
-                        UsersDataSource u = UsersDataSource.getInstance();
+                        UsersDataSource u = mUsers;
                         JsonNode users = object.getJsonNode("users");
                         for (int i = 0; i < users.size(); i++) {
                             JsonNode user = users.get(i);
@@ -2395,7 +2401,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("time", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                EventsDataSource.Event e = EventsDataSource.getInstance().addEvent(object);
+                EventsDataSource.Event e = mEvents.addEvent(object);
                 if (!backlog) {
                     notifyHandlers(EVENT_ALERT, object);
                     notifyHandlers(EVENT_BUFFERMSG, e);
@@ -2405,9 +2411,9 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
         put("channel_topic_is", new Parser() {
             @Override
             public void parse(IRCCloudJSONObject object) throws JSONException {
-                BuffersDataSource.Buffer b = BuffersDataSource.getInstance().getBufferByName(object.cid(), object.getString("chan"));
+                BuffersDataSource.Buffer b = mBuffers.getBufferByName(object.cid(), object.getString("chan"));
                 if (b != null) {
-                    ChannelsDataSource.Channel c = ChannelsDataSource.getInstance().getChannelForBuffer(b.bid);
+                    ChannelsDataSource.Channel c = mChannels.getChannelForBuffer(b.bid);
                     if (c != null) {
                         c.topic_author = object.has("author") ? object.getString("author") : object.getString("server");
                         c.topic_time = object.getLong("time");
@@ -2900,9 +2906,9 @@ else if (conn.getErrorStream() != null)
                             firstEid = -1;
                             backlog = true;
                             if (bid == -1) {
-                                BuffersDataSource.getInstance().invalidate();
-                                ChannelsDataSource.getInstance().invalidate();
-                                EventsDataSource.getInstance().clear();
+                                mBuffers.invalidate();
+                                mChannels.invalidate();
+                                mEvents.clear();
                             }
                             int count = 0;
                             while (parser.nextToken() == JsonToken.START_OBJECT) {
@@ -2944,7 +2950,7 @@ else if (conn.getErrorStream() != null)
                             totalTime -= totalParseTime;
                             Crashlytics.log(Log.DEBUG, TAG, "Total non-processing time: " + totalTime + "ms (" + (totalTime / (float) count) + "ms / object)");
 
-                            ArrayList<BuffersDataSource.Buffer> buffers = BuffersDataSource.getInstance().getBuffers();
+                            ArrayList<BuffersDataSource.Buffer> buffers = mBuffers.getBuffers();
                             for (BuffersDataSource.Buffer b : buffers) {
                                 Notifications.getInstance().deleteOldNotifications(b.bid, b.last_seen_eid);
                                 if (b.timeout > 0 && bid == -1) {
@@ -2963,7 +2969,7 @@ else if (conn.getErrorStream() != null)
                     parser.close();
 
                     if (bid != -1) {
-                        BuffersDataSource.getInstance().updateTimeout(bid, 0);
+                        mBuffers.updateTimeout(bid, 0);
                     }
                     oobTasks.remove(bid);
 
@@ -2980,7 +2986,7 @@ else if (conn.getErrorStream() != null)
                 e.printStackTrace();
                 if (bid != -1) {
                     if (!isCancelled()) {
-                        BuffersDataSource.Buffer b = BuffersDataSource.getInstance().getBuffer(bid);
+                        BuffersDataSource.Buffer b = mBuffers.getBuffer(bid);
                         if (b != null && b.timeout == 1) {
                             Crashlytics.log(Log.WARN, TAG, "Failed to fetch backlog for timed-out buffer, retrying in " + retryDelay + "ms");
                             idleTimer.schedule(new TimerTask() {
diff --git a/src/com/irccloud/android/data/BuffersDataSource.java b/src/com/irccloud/android/data/BuffersDataSource.java
index 3af6e45be..e483f39ba 100644
--- a/src/com/irccloud/android/data/BuffersDataSource.java
+++ b/src/com/irccloud/android/data/BuffersDataSource.java
@@ -108,8 +108,8 @@ public synchronized static BuffersDataSource getInstance() {
     }
 
     public BuffersDataSource() {
-        buffers = new ArrayList<Buffer>();
-        buffers_indexed = new SparseArray<Buffer>();
+        buffers = new ArrayList<>(100);
+        buffers_indexed = new SparseArray<>(100);
         collator = Collator.getInstance();
         collator.setStrength(Collator.SECONDARY);
     }
diff --git a/src/com/irccloud/android/data/ChannelsDataSource.java b/src/com/irccloud/android/data/ChannelsDataSource.java
index bc6bfdc36..51531b855 100644
--- a/src/com/irccloud/android/data/ChannelsDataSource.java
+++ b/src/com/irccloud/android/data/ChannelsDataSource.java
@@ -96,7 +96,7 @@ public synchronized static ChannelsDataSource getInstance() {
     }
 
     public ChannelsDataSource() {
-        channels = new SparseArray<Channel>();
+        channels = new SparseArray<>(100);
     }
 
     public synchronized void clear() {
diff --git a/src/com/irccloud/android/data/EventsDataSource.java b/src/com/irccloud/android/data/EventsDataSource.java
index 41504814b..50b6bc6d2 100644
--- a/src/com/irccloud/android/data/EventsDataSource.java
+++ b/src/com/irccloud/android/data/EventsDataSource.java
@@ -136,7 +136,7 @@ public synchronized static EventsDataSource getInstance() {
     }
 
     public EventsDataSource() {
-        events = new HashMap<>();
+        events = new HashMap<>(100);
     }
 
     public void clear() {
diff --git a/src/com/irccloud/android/data/ServersDataSource.java b/src/com/irccloud/android/data/ServersDataSource.java
index 07d27e150..8321ae797 100644
--- a/src/com/irccloud/android/data/ServersDataSource.java
+++ b/src/com/irccloud/android/data/ServersDataSource.java
@@ -76,7 +76,7 @@ public synchronized static ServersDataSource getInstance() {
     }
 
     public ServersDataSource() {
-        servers = new SparseArray<Server>();
+        servers = new SparseArray<>(10);
     }
 
     public void clear() {
diff --git a/src/com/irccloud/android/data/UsersDataSource.java b/src/com/irccloud/android/data/UsersDataSource.java
index 347e0724b..2a68ef2cc 100644
--- a/src/com/irccloud/android/data/UsersDataSource.java
+++ b/src/com/irccloud/android/data/UsersDataSource.java
@@ -52,7 +52,7 @@ public synchronized static UsersDataSource getInstance() {
     }
 
     public UsersDataSource() {
-        users = new HashMap<Integer, TreeMap<String, User>>();
+        users = new HashMap<>(50);
         collator = Collator.getInstance();
         collator.setStrength(Collator.SECONDARY);
     }
diff --git a/src/com/irccloud/android/fragment/BuffersListFragment.java b/src/com/irccloud/android/fragment/BuffersListFragment.java
index af5a4ee25..f7e42d4f4 100644
--- a/src/com/irccloud/android/fragment/BuffersListFragment.java
+++ b/src/com/irccloud/android/fragment/BuffersListFragment.java
@@ -152,7 +152,7 @@ public int positionForBid(int bid) {
 
         public BufferListAdapter(ListFragment context) {
             ctx = context;
-            data = new ArrayList<BufferListEntry>();
+            data = new ArrayList<>(BuffersDataSource.getInstance().count() + ServersDataSource.getInstance().count() + 10);
             eightdp = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8, getSafeResources().getDisplayMetrics());
         }
 
diff --git a/src/com/irccloud/android/fragment/MessageViewFragment.java b/src/com/irccloud/android/fragment/MessageViewFragment.java
index 3db7dbaee..340061426 100644
--- a/src/com/irccloud/android/fragment/MessageViewFragment.java
+++ b/src/com/irccloud/android/fragment/MessageViewFragment.java
@@ -177,9 +177,9 @@ private class ViewHolder {
             ImageView failed;
         }
 
-        public MessageAdapter(ListFragment context) {
+        public MessageAdapter(ListFragment context, int capacity) {
             ctx = context;
-            data = new ArrayList<>();
+            data = new ArrayList<>(capacity + 10);
             unseenHighlightPositions = new TreeSet<>(Collections.reverseOrder());
         }
 
@@ -1547,7 +1547,7 @@ protected Void doInBackground(Void... params) {
                             backlogMarker.bg_color = R.color.message_bg;
                             events.put(backlog_eid, backlogMarker);
                         }
-                        adapter = new MessageAdapter(MessageViewFragment.this);
+                        adapter = new MessageAdapter(MessageViewFragment.this, events.size());
                         refresh(adapter, events);
                     } catch (IllegalStateException e) {
                         //The list view doesn't exist yet
@@ -1565,7 +1565,7 @@ public void run() {
                         headerView.setVisibility(View.VISIBLE);
                         backlogFailed.setVisibility(View.GONE);
                         loadBacklogButton.setVisibility(View.GONE);
-                        adapter = new MessageAdapter(MessageViewFragment.this);
+                        adapter = new MessageAdapter(MessageViewFragment.this, 0);
                         setListAdapter(adapter);
                         MessageViewFragment.this.adapter = adapter;
                         requestingBacklog = true;
@@ -1579,7 +1579,7 @@ public void run() {
                         headerView.setVisibility(View.GONE);
                         backlogFailed.setVisibility(View.GONE);
                         loadBacklogButton.setVisibility(View.GONE);
-                        adapter = new MessageAdapter(MessageViewFragment.this);
+                        adapter = new MessageAdapter(MessageViewFragment.this, 0);
                         setListAdapter(adapter);
                         MessageViewFragment.this.adapter = adapter;
                     }
diff --git a/src/com/irccloud/android/fragment/UsersListFragment.java b/src/com/irccloud/android/fragment/UsersListFragment.java
index 274486ca8..31dba9d96 100644
--- a/src/com/irccloud/android/fragment/UsersListFragment.java
+++ b/src/com/irccloud/android/fragment/UsersListFragment.java
@@ -84,7 +84,7 @@ private class UserListEntry {
 
         public UserListAdapter(ListFragment context) {
             ctx = context;
-            data = new ArrayList<UserListEntry>();
+            data = new ArrayList<>(50);
         }
 
         public void setItems(ArrayList<UserListEntry> items) {