Fixed ids for user.

BCrypt/build.gradle

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('BCrypt.jar'))

app/build.gradle

@@ -28,4 +28,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.reimaginebanking.api:nessie-android-sdk:1.0.4'
     compile 'com.amazonaws:aws-java-sdk:1.11.49'
+    compile project(':BCrypt')
 }

app/src/main/java/hacknc/com/poolit/User.java

@@ -11,26 +11,26 @@
  */
 
 public class User {
-    private List<User> friends;
+    private List<Long> friends;
     private String name;
     private List<Event> events;
     private int score;
-    private String userID;
+    private long userID;
     private String accountID;
 
     public User(String name) {
-        friends = new ArrayList<User>();
+        friends = new ArrayList<Long>();
         this.name = name;
         events = new ArrayList<Event>();
         score = 0;
     }
 
     public User(Item i) {
         this.name = (String) i.get("name");
-        this.friends = (List<User>) i.get("friends");
+        this.friends = (List<Long>) i.get("friends");
         this.events = (List<Event>) i.get("events");
         this.score = (int) i.get("score");
-        this.userID = (String) i.get("userId");
+        this.userID = (long) i.get("userId");
         this.accountID = (String) i.get("account");
 
     }
@@ -39,14 +39,15 @@ public User(Item i) {
      * Returns the list of friends associated with this user
      * @return The friends attached to this account
      */
-    public List<User> getFriends() { return friends; }
+    public List<Long> getFriends() { return friends; }
 
     /**
      * Adds a new friend to this user given a name
      * @param friend The name of the account you want to add
      */
     public void addFriend(User friend) {
-        friends.add(friend);
+        long id = friend.getID();
+        friends.add(id);
     }
 
     public String getName() { return name; }
@@ -66,7 +67,7 @@ public void addEvent(String name, String info, double target, Date date, User[]
 
     public void incrementScore(int i) { score += i; }
 
-    public String getID() { return userID; }
+    public long getID() { return userID; }
 
     public void sync() {
         // Find server's copy of this User, sync values
@@ -77,9 +78,10 @@ public String getAccountID(){
     }
 
     public void removeFriend(User friend){
-        for(User u: friends){
-            if(friend == u){
-                friends.remove(u);
+        long id = friend.getID();
+        for(long i: friends){
+            if(id == i){
+                friends.remove(i);
             }
         }
     }

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':app', ':BCrypt'