diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7fc96520..847a2c66 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,15 +27,15 @@
+ android:parentActivityName=".activities.InspectorActivity"/>
{
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(GITHUB_PROJECT_URL + "/tree/" + verStr));
+ startActivity(browserIntent);
+ });
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Could not retrieve package version");
}
@@ -224,9 +226,12 @@ public class MainActivity extends AppCompatActivity implements AppsLoadListener,
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
int id = item.getItemId();
- if(id == R.id.item_monitoring) {
- Intent intent = new Intent(MainActivity.this, MonitoringActivity.class);
- startActivity(intent);
+ if(id == R.id.item_inspector) {
+ if(CaptureService.getConnsRegister() != null) {
+ Intent intent = new Intent(MainActivity.this, InspectorActivity.class);
+ startActivity(intent);
+ } else
+ Utils.showToast(this, R.string.capture_not_started);
} else if (id == R.id.action_open_github) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(GITHUB_PROJECT_URL));
startActivity(browserIntent);
@@ -272,7 +277,7 @@ public class MainActivity extends AppCompatActivity implements AppsLoadListener,
mMenuItemStartBtn.setTitle(R.string.start_button);
mMenuItemStartBtn.setEnabled(true);
mMenuItemAppSel.setEnabled(true);
- mMenuSettings.setVisible(true);
+ mMenuSettings.setEnabled(true);
}
public void appStateStarting() {
@@ -280,7 +285,8 @@ public class MainActivity extends AppCompatActivity implements AppsLoadListener,
notifyAppState();
mMenuItemStartBtn.setEnabled(false);
- mMenuSettings.setVisible(false);
+ mMenuSettings.setEnabled(false);
+ mMenuItemAppSel.setEnabled(false);
}
public void appStateRunning() {
@@ -291,7 +297,7 @@ public class MainActivity extends AppCompatActivity implements AppsLoadListener,
ContextCompat.getDrawable(this, R.drawable.ic_media_stop));
mMenuItemStartBtn.setTitle(R.string.stop_button);
mMenuItemStartBtn.setEnabled(true);
- mMenuSettings.setVisible(false);
+ mMenuSettings.setEnabled(false);
mMenuItemAppSel.setEnabled(false);
}
@@ -300,7 +306,6 @@ public class MainActivity extends AppCompatActivity implements AppsLoadListener,
notifyAppState();
mMenuItemStartBtn.setEnabled(false);
- mMenuItemAppSel.setEnabled(false);
}
@Override
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/AppsFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/AppsFragment.java
index 5907892d..fdeded9c 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/AppsFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/AppsFragment.java
@@ -7,6 +7,7 @@ import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -23,7 +24,7 @@ import com.emanuelef.remote_capture.AppsLoader;
import com.emanuelef.remote_capture.CaptureService;
import com.emanuelef.remote_capture.ConnectionsRegister;
import com.emanuelef.remote_capture.R;
-import com.emanuelef.remote_capture.activities.MonitoringActivity;
+import com.emanuelef.remote_capture.activities.InspectorActivity;
import com.emanuelef.remote_capture.adapters.AppsStatsAdapter;
import com.emanuelef.remote_capture.interfaces.AppsLoadListener;
import com.emanuelef.remote_capture.interfaces.ConnectionsListener;
@@ -40,7 +41,7 @@ public class AppsFragment extends Fragment implements ConnectionsListener, AppsL
private Handler mHandler;
private boolean mRefreshApps;
private boolean listenerSet;
- private MonitoringActivity mActivity;
+ private InspectorActivity mActivity;
private Map mApps;
@Override
@@ -53,7 +54,7 @@ public class AppsFragment extends Fragment implements ConnectionsListener, AppsL
@Override
public View onCreateView(LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
- mActivity = (MonitoringActivity) getActivity();
+ mActivity = (InspectorActivity) getActivity();
return inflater.inflate(R.layout.apps_stats, container, false);
}
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
index 91bb8724..7e075c12 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
@@ -335,7 +335,7 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
- menuInflater.inflate(R.menu.monitoring_menu, menu);
+ menuInflater.inflate(R.menu.connections_menu, menu);
mMenuItemAppSel = menu.findItem(R.id.action_show_app_filter);
mFilterIcon = mMenuItemAppSel.getIcon();
diff --git a/app/src/main/res/drawable/drawer_background.png b/app/src/main/res/drawable/drawer_background.png
new file mode 100644
index 00000000..b9578dd2
Binary files /dev/null and b/app/src/main/res/drawable/drawer_background.png differ
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
index 6d797072..e45bc184 100644
--- a/app/src/main/res/drawable/ic_logo.xml
+++ b/app/src/main/res/drawable/ic_logo.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/app/src/main/res/layout/monitoring_activity.xml b/app/src/main/res/layout/inspector_activity.xml
similarity index 85%
rename from app/src/main/res/layout/monitoring_activity.xml
rename to app/src/main/res/layout/inspector_activity.xml
index aede0368..7c4e6f1e 100644
--- a/app/src/main/res/layout/monitoring_activity.xml
+++ b/app/src/main/res/layout/inspector_activity.xml
@@ -5,12 +5,12 @@
android:orientation="vertical">
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index 164bf643..38394b09 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -8,8 +8,8 @@
@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginStart="8dp"
- android:text="PCAPdroid"
+ android:text="@string/app_name"
android:textSize="12sp"
android:textColor="@android:color/primary_text_dark"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/menu/monitoring_menu.xml b/app/src/main/res/menu/connections_menu.xml
similarity index 100%
rename from app/src/main/res/menu/monitoring_menu.xml
rename to app/src/main/res/menu/connections_menu.xml
diff --git a/app/src/main/res/menu/nav_items.xml b/app/src/main/res/menu/nav_items.xml
index bb9c93e8..13de57d4 100644
--- a/app/src/main/res/menu/nav_items.xml
+++ b/app/src/main/res/menu/nav_items.xml
@@ -2,8 +2,8 @@