|
@@ -1,9 +1,5 @@
|
|
package de.tudarmstadt.informatik.hostage.ui2.activity;
|
|
package de.tudarmstadt.informatik.hostage.ui2.activity;
|
|
|
|
|
|
-import java.io.BufferedReader;
|
|
|
|
-import java.io.InputStreamReader;
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
-
|
|
|
|
import android.app.ActionBar;
|
|
import android.app.ActionBar;
|
|
import android.app.Activity;
|
|
import android.app.Activity;
|
|
import android.app.Fragment;
|
|
import android.app.Fragment;
|
|
@@ -25,10 +21,13 @@ import android.view.View;
|
|
import android.widget.AdapterView;
|
|
import android.widget.AdapterView;
|
|
import android.widget.ListView;
|
|
import android.widget.ListView;
|
|
|
|
|
|
|
|
+import java.io.BufferedReader;
|
|
|
|
+import java.io.InputStreamReader;
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+
|
|
import de.tudarmstadt.informatik.hostage.HoneyService;
|
|
import de.tudarmstadt.informatik.hostage.HoneyService;
|
|
import de.tudarmstadt.informatik.hostage.R;
|
|
import de.tudarmstadt.informatik.hostage.R;
|
|
import de.tudarmstadt.informatik.hostage.ui.LogFilter;
|
|
import de.tudarmstadt.informatik.hostage.ui.LogFilter;
|
|
-import de.tudarmstadt.informatik.hostage.ui.ViewLogTable;
|
|
|
|
import de.tudarmstadt.informatik.hostage.ui2.adapter.DrawerListAdapter;
|
|
import de.tudarmstadt.informatik.hostage.ui2.adapter.DrawerListAdapter;
|
|
import de.tudarmstadt.informatik.hostage.ui2.fragment.HomeFragment;
|
|
import de.tudarmstadt.informatik.hostage.ui2.fragment.HomeFragment;
|
|
import de.tudarmstadt.informatik.hostage.ui2.fragment.ProfileManagerFragment;
|
|
import de.tudarmstadt.informatik.hostage.ui2.fragment.ProfileManagerFragment;
|
|
@@ -43,6 +42,28 @@ import de.tudarmstadt.informatik.hostage.ui2.model.DrawerListItem;
|
|
* @created 12.01.14 23:24
|
|
* @created 12.01.14 23:24
|
|
*/
|
|
*/
|
|
public class MainActivity extends Activity {
|
|
public class MainActivity extends Activity {
|
|
|
|
+
|
|
|
|
+ public enum MainMenuItem {
|
|
|
|
+ UNUSED(-1),
|
|
|
|
+ HOME(0),
|
|
|
|
+ THREAT_MAP(1),
|
|
|
|
+ RECORDS(2),
|
|
|
|
+ SERVICES(3),
|
|
|
|
+ PROFILE_MANAGER(4),
|
|
|
|
+ SETTINGS(5),
|
|
|
|
+ APPLICATION_INFO(6);
|
|
|
|
+ private int value;
|
|
|
|
+
|
|
|
|
+ private MainMenuItem(int value) {
|
|
|
|
+ this.value = value;
|
|
|
|
+ }
|
|
|
|
+ static public MainMenuItem create(int value){
|
|
|
|
+ if (value < -1 || value+1 >= MainMenuItem.values().length) return MainMenuItem.HOME;
|
|
|
|
+ return MainMenuItem.values()[value+1];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
private DrawerLayout mDrawerLayout;
|
|
private DrawerLayout mDrawerLayout;
|
|
private ListView mDrawerList;
|
|
private ListView mDrawerList;
|
|
private ActionBarDrawerToggle mDrawerToggle;
|
|
private ActionBarDrawerToggle mDrawerToggle;
|
|
@@ -51,7 +72,7 @@ public class MainActivity extends Activity {
|
|
private CharSequence mTitle;
|
|
private CharSequence mTitle;
|
|
|
|
|
|
public Fragment displayedFragment;
|
|
public Fragment displayedFragment;
|
|
- private int selectedMenuItemPosition;
|
|
|
|
|
|
+ private MainMenuItem selectedMenuItem;
|
|
|
|
|
|
private ArrayList<DrawerListItem> drawerItems;
|
|
private ArrayList<DrawerListItem> drawerItems;
|
|
private HoneyService mHoneyService;
|
|
private HoneyService mHoneyService;
|
|
@@ -67,7 +88,7 @@ public class MainActivity extends Activity {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
super.onCreate(savedInstanceState);
|
|
MainActivity.context = getApplicationContext();
|
|
MainActivity.context = getApplicationContext();
|
|
- this.selectedMenuItemPosition = 0;
|
|
|
|
|
|
+ this.selectedMenuItem = MainMenuItem.HOME;
|
|
|
|
|
|
setContentView(R.layout.activity_drawer_main);
|
|
setContentView(R.layout.activity_drawer_main);
|
|
|
|
|
|
@@ -178,32 +199,32 @@ public class MainActivity extends Activity {
|
|
|
|
|
|
private void displayView(int position) {
|
|
private void displayView(int position) {
|
|
// DONT OPEN SAME VIEW AGAIN
|
|
// DONT OPEN SAME VIEW AGAIN
|
|
- int menuItemPosition = position;
|
|
|
|
|
|
+ MainMenuItem menuItemPosition = MainMenuItem.create(position);
|
|
|
|
|
|
Fragment fragment = null;
|
|
Fragment fragment = null;
|
|
|
|
|
|
- if (this.selectedMenuItemPosition == position && this.displayedFragment != null) {
|
|
|
|
- menuItemPosition = -1;
|
|
|
|
|
|
+ if (this.selectedMenuItem == menuItemPosition && this.displayedFragment != null) {
|
|
|
|
+ menuItemPosition = MainMenuItem.UNUSED;
|
|
fragment = this.displayedFragment;
|
|
fragment = this.displayedFragment;
|
|
}
|
|
}
|
|
|
|
|
|
// update the main content by replacing fragments
|
|
// update the main content by replacing fragments
|
|
switch (menuItemPosition) {
|
|
switch (menuItemPosition) {
|
|
- case 0:
|
|
|
|
|
|
+ case HOME:
|
|
fragment = new HomeFragment();
|
|
fragment = new HomeFragment();
|
|
break;
|
|
break;
|
|
- case 1:
|
|
|
|
|
|
+ case THREAT_MAP:
|
|
fragment = new ThreatMapFragment();
|
|
fragment = new ThreatMapFragment();
|
|
break;
|
|
break;
|
|
- case 2:
|
|
|
|
|
|
+ case RECORDS:
|
|
Intent intent = this.getIntent();
|
|
Intent intent = this.getIntent();
|
|
intent.removeExtra(LogFilter.LOG_FILTER_INTENT_KEY);
|
|
intent.removeExtra(LogFilter.LOG_FILTER_INTENT_KEY);
|
|
fragment = new RecordOverviewFragment();
|
|
fragment = new RecordOverviewFragment();
|
|
break;
|
|
break;
|
|
- case 3:
|
|
|
|
|
|
+ case SERVICES:
|
|
fragment = new ServicesFragment();
|
|
fragment = new ServicesFragment();
|
|
break;
|
|
break;
|
|
- case 4:
|
|
|
|
|
|
+ case PROFILE_MANAGER:
|
|
fragment = new ProfileManagerFragment();
|
|
fragment = new ProfileManagerFragment();
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
@@ -221,7 +242,7 @@ public class MainActivity extends Activity {
|
|
mDrawerList.setItemChecked(position, true);
|
|
mDrawerList.setItemChecked(position, true);
|
|
mDrawerList.setSelection(position);
|
|
mDrawerList.setSelection(position);
|
|
setTitle(drawerItems.get(position).text);
|
|
setTitle(drawerItems.get(position).text);
|
|
- this.selectedMenuItemPosition = position;
|
|
|
|
|
|
+ this.selectedMenuItem = MainMenuItem.create(position);
|
|
}
|
|
}
|
|
|
|
|
|
mDrawerLayout.closeDrawer(mDrawerList);
|
|
mDrawerLayout.closeDrawer(mDrawerList);
|