Merge remote-tracking branch 'origin/master'

Android_App/joiintheclub/app/src/main/java/com/example/joiintheclub/BackEnd/User.java

@@ -310,14 +310,15 @@ public static String[] getUserGroups(String userID, boolean isLoggedIn)
 
 //maybe not boolean since may have to return info
     //public static boolean userInformation(String userID)
-    private static String[] userInformation(String userID)
+    public static String[] userInformation(String userID)
     {
         //Array of strings containing user profile information
         String[] userProfile = new String[6];
 
         //User ID is in the first position for
         userProfile[0] = userID;
         //JSON object for requesting user information
+        /*
         JSONObject userInfoRequestGET = new JSONObject();
         AtomicReference<JSONObject> userInfoResponseGET =
                 new AtomicReference<> (new JSONObject());
@@ -351,35 +352,40 @@ private static String[] userInformation(String userID)
                 //else
                 // {
                 //Get the user information -????????
-
+/*
                 String first_name = userInfoResponseGET.get().get("first_name").toString();
                 String last_name = userInfoResponseGET.get().get("last_name").toString();
                 String email = userInfoResponseGET.get().get("email").toString();
                 String password = userInfoResponseGET.get().get("password").toString();
-                //stuff for profile picture here!!!!!
+
 
                 userProfile[1] = first_name;
                 userProfile[2] = last_name;
                 userProfile[3] = email;
                 userProfile[4] = password;
-                //PROFILE PICTURE HERE
-
-                /*
-                //Variables now have this information - ?????
-                User.firstName = first_name;
-                User.lastName = last_name;
-                User.email = email;
-                */
+
+
+
                 //profile picture!!!!!
 
                 //}
-            }
-
+      //      }
+/*
         } catch (JSONException e)
         {
             e.printStackTrace();
            // return false;
         }
+        */
+
+            //this is just for now - simply for hardcode testing
+            //later uncomment above as appropriate
+            //later comment out/remove below section
+            userProfile[0] = "123456";
+            userProfile[1] = "Stephen";
+            userProfile[2] = "Styffe";
+            userProfile[3] = "sample@gmail.com";
+            userProfile[4] = "password1";
         return userProfile;
     }