Access token support, channel user count caching.

2 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/com/morlunk/jumble/model/Channel.java b/src/main/java/com/morlunk/jumble/model/Channel.java
index 300e28e..cedf236 100644
--- a/src/main/java/com/morlunk/jumble/model/Channel.java
+++ b/src/main/java/com/morlunk/jumble/model/Channel.java
@@ -35,6 +35,7 @@ public final class Channel implements Parcelable {
     private List<Integer> mSubchannels = new ArrayList<Integer>();
     private List<Integer> mUsers = new ArrayList<Integer>();
     private List<Integer> mLinks = new ArrayList<Integer>();
+    private int mUserCount;
 
     public static final Parcelable.Creator<Channel> CREATOR = new Parcelable.Creator<Channel>() {
 
@@ -75,6 +76,7 @@ public final class Channel implements Parcelable {
         out.writeList(mSubchannels);
         out.writeList(mUsers);
         out.writeList(mLinks);
+        out.writeInt(mUserCount);
     }
 
     public void readFromParcel(Parcel in) {
@@ -90,6 +92,7 @@ public final class Channel implements Parcelable {
         mSubchannels = in.readArrayList(null);
         mUsers = in.readArrayList(null);
         mLinks = in.readArrayList(null);
+        mUserCount = in.readInt();
     }
 
     @Override
@@ -192,4 +195,15 @@ public final class Channel implements Parcelable {
     public void clearLinks() {
         mLinks.clear();
     }
+
+    /**
+     * @return The sum of users in this channel and its subchannels.
+     */
+    public int getSubchannelUserCount() {
+        return mUserCount;
+    }
+
+    public void setSubchannelUserCount(int userCount) {
+        mUserCount = userCount;
+    }
 }
diff --git a/src/main/java/com/morlunk/jumble/model/User.java b/src/main/java/com/morlunk/jumble/model/User.java
index 4c3eee4..fa3e38d 100644
--- a/src/main/java/com/morlunk/jumble/model/User.java
+++ b/src/main/java/com/morlunk/jumble/model/User.java
@@ -45,7 +45,7 @@ public class User implements Parcelable {
     private boolean mPrioritySpeaker;
     private boolean mRecording;
 
-    private int mChannel;
+    private int mChannel = -1;
 
     private TalkState mTalkState = TalkState.PASSIVE;