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 bdda4404..080d8410 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 @@ -678,7 +678,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig public boolean onOptionsItemSelected(@NonNull MenuItem item) { int id = item.getItemId(); - if(id == R.id.start_live_capture) { + if(id == R.id.action_start) { mStartPressed = true; startCapture(); return true; 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 bf98cb5c..6360d272 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 @@ -68,6 +68,7 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr private Menu mMenu; private MenuItem mStartBtn; private MenuItem mStopBtn; + private MenuItem mOpenPcap; private ImageView mFilterIcon; private MenuItem mMenuSettings; private TextView mInterfaceInfo; @@ -166,6 +167,7 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr mStartBtn = mMenu.findItem(R.id.action_start); mStopBtn = mMenu.findItem(R.id.action_stop); mMenuSettings = mMenu.findItem(R.id.action_settings); + mOpenPcap = mMenu.findItem(R.id.open_pcap); refreshStatus(); } @@ -312,11 +314,13 @@ public class StatusFragment extends Fragment implements AppStateListener, MenuPr mStopBtn.setEnabled(true); mStopBtn.setVisible(!CaptureService.isAlwaysOnVPN()); mMenuSettings.setEnabled(false); + mOpenPcap.setEnabled(false); } else { // ready || starting mStopBtn.setVisible(false); mStartBtn.setEnabled(true); mStartBtn.setVisible(!CaptureService.isAlwaysOnVPN()); mMenuSettings.setEnabled(true); + mOpenPcap.setEnabled(true); } } diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 85800511..c386fe24 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -7,17 +7,7 @@ android:title="@string/start_button" android:orderInCategory="10" android:icon="@drawable/ic_play_arrow" - app:showAsAction="always"> - - - - - - + app:showAsAction="always" /> + +