|
@@ -143,7 +143,6 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
private static final int MENU_ITEM_EXTERNAL_LINK = 111;
|
|
|
private static final int MAX_LOGO_SIZE_PX = 1000;
|
|
|
private static final int RELATIVE_THRESHOLD_WARNING = 80;
|
|
|
- public static final String OPEN_DRAWER_MENU = "OPEN_DRAWER_MENU";
|
|
|
|
|
|
/**
|
|
|
* Reference to the drawer layout.
|
|
@@ -883,30 +882,6 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- protected void onDestroy() {
|
|
|
- super.onDestroy();
|
|
|
- try {
|
|
|
- LocalBroadcastManager.getInstance(this).unregisterReceiver(openDrawerReceiver);
|
|
|
- } catch (IllegalArgumentException e) {
|
|
|
- Log_OC.d(TAG, "drawerMenuUpdateReceiver not registered");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private void registerOpenDrawerReceiver() {
|
|
|
- IntentFilter filter = new IntentFilter(OPEN_DRAWER_MENU);
|
|
|
- LocalBroadcastManager.getInstance(this).registerReceiver(openDrawerReceiver, filter);
|
|
|
- }
|
|
|
-
|
|
|
- private final BroadcastReceiver openDrawerReceiver = new BroadcastReceiver() {
|
|
|
- @Override
|
|
|
- public void onReceive(Context context, Intent intent) {
|
|
|
- if (!isDrawerOpen()) {
|
|
|
- openDrawer();
|
|
|
- }
|
|
|
- }
|
|
|
- };
|
|
|
-
|
|
|
/**
|
|
|
* checks/highlights the provided menu item if the drawer has been initialized and the menu item exists.
|
|
|
*
|
|
@@ -923,6 +898,10 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if (menuItem.isChecked()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
viewThemeUtils.platform.colorNavigationView(mNavigationView);
|
|
|
menuItem.setChecked(true);
|
|
|
}
|
|
@@ -1048,7 +1027,6 @@ public abstract class DrawerActivity extends ToolbarActivity
|
|
|
|
|
|
externalLinksProvider = new ExternalLinksProvider(getContentResolver());
|
|
|
arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
|
|
|
- registerOpenDrawerReceiver();
|
|
|
}
|
|
|
|
|
|
@Override
|