diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java index 6b16c7f2..48309806 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java +++ b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java @@ -631,7 +631,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); - if(id == R.id.action_start) { + if(id == R.id.start_live_capture) { startCapture(); return true; } else if(id == R.id.action_stop) { diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java index f8667d4f..dd1aedab 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java +++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/StatusFragment.java @@ -67,7 +67,6 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr private Menu mMenu; private MenuItem mStartBtn; private MenuItem mStopBtn; - private MenuItem mOpenPcap; private MenuItem mMenuSettings; private TextView mInterfaceInfo; private TextView mCollectorInfo; @@ -183,7 +182,6 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr mMenu = menu; mStartBtn = mMenu.findItem(R.id.action_start); mStopBtn = mMenu.findItem(R.id.action_stop); - mOpenPcap = mMenu.findItem(R.id.open_pcap); mMenuSettings = mMenu.findItem(R.id.action_settings); refreshStatus(); } @@ -329,8 +327,6 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr mStartBtn.setVisible(!CaptureService.isAlwaysOnVPN()); mMenuSettings.setEnabled(true); } - - mOpenPcap.setEnabled((state == AppState.ready)); } switch(state) { diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 8cf90595..85800511 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -7,7 +7,17 @@ android:title="@string/start_button" android:orderInCategory="10" android:icon="@drawable/ic_play_arrow" - app:showAsAction="always" /> + app:showAsAction="always"> + + + + + + - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0fe99e82..ed0ffabb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -489,4 +489,5 @@ PCAP file loading aborted "Could not resolve host %1$s To show the actual apps instead of \"%1$s\", be sure to enable the \"%2$s\" option before exporting the PCAP file + Live capture