#43 done. User can join ant authenticate selft with PIN

grambas · Oct 31, 2017 · 28c975d · 28c975d
1 parent be5e325
commit 28c975d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/application/app/src/main/java/isdp/guess_a_song/JoinGame.java b/application/app/src/main/java/isdp/guess_a_song/JoinGame.java
@@ -140,7 +140,7 @@ public void message(PubNub pubnub, PNMessageResult message) {
                     Log.v(Constants.LOGT, "PLAYER MESSAGE LISTENER: (" +message.toString() + ")");
                     Gson gson = new Gson();
                     Action action= gson.fromJson(message.getMessage(), Action.class);
-                    if(action.getRecipient().equals(userName)  ){
+                    if(action.getRecipient().equals(userName) || action.getRecipient().equals(Constants.A_FOR_ALL) ){
                         if (action.getAction().equals(Constants.A_AUTH_RESPONSE)) {
                             if (action.getValue().equals(Constants.TRUE)) {
 
@@ -198,7 +198,14 @@ public void run() {
                         }else if (action.getAction().equals(Constants.A_START_GAME)) {
                             if ( action.getValue().equals(Constants.TRUE) && action.getPublisher().equals(Constants.HOST_USERNAME)) {
                                //TODO START A GAME TRIGGER HERE
-                           }
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                       info_field.setText("Host started the game. Redirecting finds here!");
+                                    }
+                                });
+
+                            }
                         }
                     }
 

diff --git a/application/app/src/main/java/isdp/guess_a_song/_4GameRoom.java b/application/app/src/main/java/isdp/guess_a_song/_4GameRoom.java
@@ -183,6 +183,7 @@ public void startGame(View view) {
                 players.add(new UserProfile(entry.getValue().getSender()));
             }
         }
+        client.publish(gameID,new Action(Constants.A_START_GAME,Constants.TRUE,Constants.HOST_USERNAME,Constants.A_FOR_ALL));
 
 //        PresencePojo temp;
 //        for (int i=0;i<this.mPresence.getCount();i++){

diff --git a/application/app/src/main/java/isdp/guess_a_song/pubsub/PresencePnCallback.java b/application/app/src/main/java/isdp/guess_a_song/pubsub/PresencePnCallback.java
@@ -57,8 +57,8 @@ public void presence(PubNub pubnub, PNPresenceEventResult presence) {
                         .getAsJsonObject()
                         .get("is_auth")
                         .getAsBoolean();
-                 pm = new PresencePojo(sender, presenceString, timestamp,is_auth);
                 presenceString  = "join + "+presenceString;
+                pm = new PresencePojo(sender, presenceString, timestamp,is_auth);
                 Log.d(Constants.LOGT, "HOST PRESENCE= "+pm.toString());
             }else{
                 pm = new PresencePojo(sender, presenceString, timestamp);

diff --git a/application/app/src/main/java/isdp/guess_a_song/utils/Constants.java b/application/app/src/main/java/isdp/guess_a_song/utils/Constants.java
@@ -20,6 +20,7 @@ public class Constants {
     public final static String A_LOG_IN  = "log_in";
     public final static String A_AUTH_RESPONSE = "auth_check";
     public final static String A_START_GAME = "start_game";
+    public final static String A_FOR_ALL = "all";