Merge user list to develop #24

Merged
s416204 merged 25 commits from tutors-list-activity into develop 2018-11-02 18:00:23 +01:00
Showing only changes of commit 7019864b9a - Show all commits

View File

@ -60,13 +60,13 @@ public abstract class BaseActivity
String itemName = (String)item.getTitle();
Intent launchIntent;
if(itemName.equals("Whitelist")){
/*launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
/* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
startActivity(launchIntent);*/
}else if (itemName.equals("Blacklist")){
/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
startActivity(launchIntent);*/
}else if (itemName.equals("Profile")){
/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class);
/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class);
startActivity(launchIntent);*/
}else if (itemName.equals("Settings")){
launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);