Drawer fix, suppressed uploads once again

app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java

@@ -127,29 +127,29 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
         parseDownloadPageTask.execute(downloadsUrl);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflates the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.downloads_menu, menu);
-        super.onCreateOptionsMenu(menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle presses on the action bar items
-        switch (item.getItemId()) {
-            case R.id.menu_upload:
-                Intent intent = new Intent(DownloadsActivity.this, UploadActivity.class);
-                Bundle extras = new Bundle();
-                extras.putString(BUNDLE_UPLOAD_CATEGORY, downloadsNav);
-                intent.putExtras(extras);
-                startActivity(intent);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        // Inflates the menu; this adds items to the action bar if it is present.
+//        getMenuInflater().inflate(R.menu.downloads_menu, menu);
+//        super.onCreateOptionsMenu(menu);
+//        return true;
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        // Handle presses on the action bar items
+//        switch (item.getItemId()) {
+//            case R.id.menu_upload:
+//                Intent intent = new Intent(DownloadsActivity.this, UploadActivity.class);
+//                Bundle extras = new Bundle();
+//                extras.putString(BUNDLE_UPLOAD_CATEGORY, downloadsNav);
+//                intent.putExtras(extras);
+//                startActivity(intent);
+//                return true;
+//            default:
+//                return super.onOptionsItemSelected(item);
+//        }
+//    }
 
     @Override
     public void onLoadMore() {

app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java

@@ -241,17 +241,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                 .withIcon(homeIcon)
                 .withSelectedIcon(homeIconSelected);
 
-
-        if (sessionManager.isLoggedIn()) //When logged in
-        {
-            loginLogoutItem = new PrimaryDrawerItem()
-                    .withTextColor(primaryColor)
-                    .withSelectedColor(selectedSecondaryColor)
-                    .withIdentifier(LOG_ID)
-                    .withName(R.string.logout)
-                    .withIcon(logoutIcon)
-                    .withSelectable(false);
-            downloadsItem = new PrimaryDrawerItem()
+        downloadsItem = new PrimaryDrawerItem() // Don't put it in the if below
                 .withTextColor(primaryColor)
                 .withSelectedColor(selectedPrimaryColor)
                 .withSelectedTextColor(selectedSecondaryColor)
@@ -267,6 +257,16 @@ public abstract class BaseActivity extends AppCompatActivity {
 //                    .withName(R.string.upload)
 //                    .withIcon(uploadIcon)
 //                    .withSelectedIcon(uploadIconSelected);
+
+        if (sessionManager.isLoggedIn()) //When logged in
+        {
+            loginLogoutItem = new PrimaryDrawerItem()
+                    .withTextColor(primaryColor)
+                    .withSelectedColor(selectedSecondaryColor)
+                    .withIdentifier(LOG_ID)
+                    .withName(R.string.logout)
+                    .withIcon(logoutIcon)
+                    .withSelectable(false);
         } else
             loginLogoutItem = new PrimaryDrawerItem()
                     .withTextColor(primaryColor)
@@ -410,16 +410,16 @@ public abstract class BaseActivity extends AppCompatActivity {
             if (!sessionManager.isLoggedIn()) //When logged out or if user is guest
             {
                 drawer.removeItem(DOWNLOADS_ID);
-                drawer.removeItem(UPLOAD_ID);
+//                drawer.removeItem(UPLOAD_ID);
                 loginLogoutItem.withName(R.string.login).withIcon(loginIcon); //Swap logout with login
                 profileDrawerItem.withName(sessionManager.getUsername());
                 setDefaultAvatar();
             } else {
                 if (!drawer.getDrawerItems().contains(downloadsItem)) {
-                    drawer.addItemAtPosition(downloadsItem, 2);
+                    drawer.addItemAtPosition(downloadsItem, 3);
                 }
 //                if (!drawer.getDrawerItems().contains(uploadItem)) {
-//                    drawer.addItemAtPosition(uploadItem, 3);
+//                    drawer.addItemAtPosition(uploadItem, 4);
 //                }
                 loginLogoutItem.withName(R.string.logout).withIcon(logoutIcon); //Swap login with logout
                 profileDrawerItem.withName(sessionManager.getUsername());