Fixes menu selection issue

app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java

@@ -29,7 +29,6 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SearchView;
-import android.util.Log;
 import android.view.View;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
@@ -105,7 +104,6 @@ public class MainActivity extends AppCompatActivity
     private ViewPager viewPager;
     private RelativeLayout main_app_container;
     private Stack<Integer> stackBack = new Stack<>();
-
     public MainActivity() {
     }
 
@@ -194,7 +192,7 @@ public class MainActivity extends AppCompatActivity
                 if( item != null){
                     toolbarTitle.setText(item.getTitle());
                     populateTitleWithTag(fragmentTag, item.getTitle().toString(), item.getItemId());
-                    unCheckAllMenuItems(navigationView.getMenu());
+                    unCheckAllMenuItems(navigationView);
                     item.setChecked(true);
                 }
                 if( tab.getPosition() < 3 )
@@ -365,17 +363,17 @@ public class MainActivity extends AppCompatActivity
             final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
             userIdIntent = extras.getString(PREF_KEY_ID); //Id of the account in the intent
             if (extras.getInt(INTENT_ACTION) == NOTIFICATION_INTENT){
-                unCheckAllMenuItems(navigationView.getMenu());
                 changeUser(MainActivity.this, userIdIntent, false); //Connects the account which is related to the notification
+                unCheckAllMenuItems(navigationView);
                 tabLayout.getTabAt(3).select();
                 matchingIntent = true;
             }else if( extras.getInt(INTENT_ACTION) == HOME_TIMELINE_INTENT){
-                unCheckAllMenuItems(navigationView.getMenu());
+                unCheckAllMenuItems(navigationView);
                 changeUser(MainActivity.this, userIdIntent, false); //Connects the account which is related to the notification
                 tabLayout.getTabAt(0).select();
                 matchingIntent = true;
             }else if( extras.getInt(INTENT_ACTION) == CHANGE_THEME_INTENT){
-                unCheckAllMenuItems(navigationView.getMenu());
+                unCheckAllMenuItems(navigationView);
                 navigationView.setCheckedItem(R.id.nav_settings);
                 navigationView.getMenu().performIdentifierAction(R.id.nav_settings, 0);
                 toolbarTitle.setText(R.string.settings);
@@ -424,7 +422,7 @@ public class MainActivity extends AppCompatActivity
                 tabLayout.setVisibility(View.VISIBLE);
                 main_app_container.setVisibility(View.GONE);
                 final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
-                unCheckAllMenuItems(navigationView.getMenu());
+                unCheckAllMenuItems(navigationView);
                 toot.setVisibility(View.VISIBLE);
 
                 switch (viewPager.getCurrentItem()){
@@ -526,6 +524,7 @@ public class MainActivity extends AppCompatActivity
         //Proceeds to update of the authenticated account
         if(Helper.isLoggedIn(getApplicationContext()))
             new UpdateAccountInfoByIDAsyncTask(getApplicationContext(), MainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+
     }
 
 
@@ -537,7 +536,7 @@ public class MainActivity extends AppCompatActivity
         // Handle navigation view item clicks here.
         int id = item.getItemId();
         final NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
-        unCheckAllMenuItems(navigationView.getMenu());
+        unCheckAllMenuItems(navigationView);
         item.setChecked(true);
         //Remove the search bar
         if( !toolbar_search.isIconified() ) {

app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java

@@ -28,7 +28,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
 import android.text.Html;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java

@@ -1029,21 +1029,21 @@ public class Helper {
                 int matchEnd = matcher.end();
                 final String url = spannableString.toString().substring(matchStart, matchEnd);
                 spannableString.setSpan(new ClickableSpan() {
-                        @Override
-                        public void onClick(View textView) {
-                            Intent intent = new Intent(context, WebviewActivity.class);
-                            Bundle b = new Bundle();
-                            b.putString("url", url);
-                            intent.putExtras(b);
-                            context.startActivity(intent);
-                        }
-                        @Override
-                        public void updateDrawState(TextPaint ds) {
-                            super.updateDrawState(ds);
-                        }
-                    },
-                    matchStart, matchEnd,
-                    Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+                    @Override
+                    public void onClick(View textView) {
+                        Intent intent = new Intent(context, WebviewActivity.class);
+                        Bundle b = new Bundle();
+                        b.putString("url", url);
+                        intent.putExtras(b);
+                        context.startActivity(intent);
+                    }
+                    @Override
+                    public void updateDrawState(TextPaint ds) {
+                        super.updateDrawState(ds);
+                    }
+                },
+                matchStart, matchEnd,
+                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
             }
         }
@@ -1057,21 +1057,21 @@ public class Helper {
                     int startPosition = spannableString.toString().indexOf(targetedAccount);
                     int endPosition = spannableString.toString().lastIndexOf(targetedAccount) + targetedAccount.length();
                     spannableString.setSpan(new ClickableSpan() {
-                                @Override
-                                public void onClick(View textView) {
-                                    Intent intent = new Intent(context, ShowAccountActivity.class);
-                                    Bundle b = new Bundle();
-                                    b.putString("accountId", mention.getId());
-                                    intent.putExtras(b);
-                                    context.startActivity(intent);
-                                }
-                                @Override
-                                public void updateDrawState(TextPaint ds) {
-                                    super.updateDrawState(ds);
-                                }
-                            },
-                            startPosition, endPosition,
-                            Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+                        @Override
+                        public void onClick(View textView) {
+                            Intent intent = new Intent(context, ShowAccountActivity.class);
+                            Bundle b = new Bundle();
+                            b.putString("accountId", mention.getId());
+                            intent.putExtras(b);
+                            context.startActivity(intent);
+                        }
+                        @Override
+                        public void updateDrawState(TextPaint ds) {
+                            super.updateDrawState(ds);
+                        }
+                    },
+                    startPosition, endPosition,
+                    Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
 
                 }
 
@@ -1373,12 +1373,19 @@ public class Helper {
         return false;
     }
 
-    public static void unCheckAllMenuItems(@NonNull final Menu menu) {
+
+
+    public static void unCheckAllMenuItems(NavigationView navigationView){
+        navigationView.setCheckedItem(R.id.menu_none);
+        unCheckAllMenuItemsRec(navigationView.getMenu());
+    }
+
+    private static void unCheckAllMenuItemsRec(@NonNull final Menu menu) {
         int size = menu.size();
         for (int i = 0; i < size; i++) {
             final MenuItem item = menu.getItem(i);
             if(item.hasSubMenu()) {
-                unCheckAllMenuItems(item.getSubMenu());
+                unCheckAllMenuItemsRec(item.getSubMenu());
             } else {
                 item.setChecked(false);
             }

app/src/main/res/menu/activity_main_drawer.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+
     <group android:checkableBehavior="single">
         <item android:id="@+id/nav_account_list"
             android:visible="false"
             android:title="@string/accounts">
             <menu /></item>
     </group>
-    <group android:checkableBehavior="single">
+    <group>
         <item
             android:title="@string/communication_menu_title"
             android:id="@+id/nav_main_com"
             >
             <menu>
                 <group android:checkableBehavior="single">
+                    <item
+                        android:id="@+id/menu_none"
+                        android:title=""
+                        android:visible="false"/>
                     <item
                         android:id="@+id/nav_home"
                         android:icon="@drawable/ic_action_home"