Made the RDY checkbox in the phase settings actually work for muster …

…phases. Made gunboat games have the chat option in the side menu (but not the option to create channels), so that they can get system messages.
zond · May 21, 2020 · 26944d2 · 26944d2
1 parent a301233
commit 26944d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/app/src/main/java/se/oort/diplicity/MemberTable.java b/app/src/main/java/se/oort/diplicity/MemberTable.java
@@ -53,7 +53,8 @@ public void setPhaseStates(Game game, PhaseMeta phaseMeta, List<PhaseState> phas
     }
     public void setMembers(final RetrofitActivity retrofitActivity, Game game, final List<Member> members) {
         removeAllViews();
-	boolean fakeFoundPhaseState = false;
+        Member loggedInMember = retrofitActivity.getLoggedInMember(game);
+    	boolean fakeFoundPhaseState = false;
         for (final Member member : members) {
             boolean rowOK = true;
             TableRow tableRow = new TableRow(retrofitActivity);
@@ -118,7 +119,7 @@ public void setMembers(final RetrofitActivity retrofitActivity, Game game, final
                     readyToResolve.setText(R.string.rdy);
                     readyToResolve.setLayoutParams(wrapContentParams);
                     readyToResolve.setChecked(finalFoundState.ReadyToResolve);
-                    if ((!foundState.NoOrders || fakeFoundPhaseState) && !phaseMeta.Resolved && retrofitActivity.getLoggedInUser().Id.equals(member.User.Id)) {
+                    if ((!foundState.NoOrders || fakeFoundPhaseState) && !phaseMeta.Resolved && loggedInMember.User.Id.equals(member.User.Id)) {
                         final Game finalGame = game;
                         readyToResolve.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                             @Override

diff --git a/app/src/main/java/se/oort/diplicity/game/GameActivity.java b/app/src/main/java/se/oort/diplicity/game/GameActivity.java
@@ -285,11 +285,7 @@ public void onDrawerStateChanged(int newState) {
 
         navigationView = (NavigationView) findViewById(R.id.nav_view);
         Menu nav_Menu = navigationView.getMenu();
-        if (game.Started) {
-            if (!game.Finished && game.DisableConferenceChat && game.DisableGroupChat && game.DisablePrivateChat) {
-                nav_Menu.findItem(R.id.nav_press).setVisible(false);
-            }
-        } else {
+        if (!game.Started) {
             nav_Menu.findItem(R.id.nav_orders).setVisible(false);
             nav_Menu.findItem(R.id.nav_phases).setVisible(false);
             nav_Menu.findItem(R.id.nav_press).setVisible(false);
@@ -376,7 +372,7 @@ public String toString() {
 
     public void showPress() {
         hideAllExcept(R.id.press_view);
-        if (member != null) {
+        if (member != null && !(game.DisableConferenceChat && game.DisableGroupChat && game.DisablePrivateChat)) {
             FloatingActionButton button = (FloatingActionButton) findViewById(R.id.create_channel_button);
             button.setVisibility(View.VISIBLE);
             button.setOnClickListener(new View.OnClickListener() {