From 78d2e12233fca06531f398ec1a8ae5bd741252e8 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Thu, 3 Jun 2021 10:55:03 +0200 Subject: [PATCH] Add ads placeholders --- .../com/emanuelef/remote_capture/CaptureService.java | 10 ++++++++++ .../remote_capture/activities/MainActivity.java | 3 +-- app/src/main/jni/vpnproxy-jni/vpnproxy.c | 6 +++--- app/src/main/jni/vpnproxy-jni/vpnproxy.h | 4 ++++ app/src/main/res/layout/apps_stats.xml | 3 ++- app/src/main/res/layout/connections.xml | 3 ++- app/src/main/res/layout/main_screen.xml | 9 +++++++-- app/src/main/res/layout/settings_activity.xml | 11 +++++++++-- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 10 files changed, 40 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java b/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java index 79f57cfa..06f322fa 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java +++ b/app/src/main/java/com/emanuelef/remote_capture/CaptureService.java @@ -51,6 +51,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; import com.emanuelef.remote_capture.activities.MainActivity; +import com.emanuelef.remote_capture.model.AppDescriptor; import com.emanuelef.remote_capture.model.ConnectionDescriptor; import com.emanuelef.remote_capture.model.Prefs; import com.emanuelef.remote_capture.model.VPNStats; @@ -582,6 +583,15 @@ public class CaptureService extends VpnService implements Runnable { public int getAppFilterUid() { return(app_filter_uid); } + public int getOwnAppUid() { + AppDescriptor app = AppsResolver.resolve(getPackageManager(), BuildConfig.APPLICATION_ID); + + if(app != null) + return app.getUid(); + + return Utils.UID_NO_FILTER; + } + // returns 1 if dumpPcapData should be called public int dumpPcapToJava() { return(((dump_mode == Prefs.DumpMode.HTTP_SERVER) || (dump_mode == Prefs.DumpMode.PCAP_FILE)) ? 1 : 0); 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 7d0369b7..825b7de0 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 @@ -105,6 +105,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig protected void onCreate(Bundle savedInstanceState) { setTheme(R.style.AppTheme_NoActionBar); super.onCreate(savedInstanceState); + setContentView(R.layout.main_activity); initAppState(); checkPermissions(); @@ -116,8 +117,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig .errorDrawable(R.drawable.ic_app_crash) .apply(); - setContentView(R.layout.main_activity); - mTabLayout = findViewById(R.id.tablayout); mPager = findViewById(R.id.pager); diff --git a/app/src/main/jni/vpnproxy-jni/vpnproxy.c b/app/src/main/jni/vpnproxy-jni/vpnproxy.c index 7a9be95f..51ec8fbd 100644 --- a/app/src/main/jni/vpnproxy-jni/vpnproxy.c +++ b/app/src/main/jni/vpnproxy-jni/vpnproxy.c @@ -148,7 +148,7 @@ char* getStringPref(vpnproxy_data_t *proxy, const char *key, char *buf, int bufs /* ******************************************************* */ -static u_int32_t getIPv4Pref(JNIEnv *env, jobject vpn_inst, const char *key) { +u_int32_t getIPv4Pref(JNIEnv *env, jobject vpn_inst, const char *key) { struct in_addr addr = {0}; jmethodID midMethod = jniGetMethodID(env, cls.vpn_service, key, "()Ljava/lang/String;"); @@ -171,7 +171,7 @@ static u_int32_t getIPv4Pref(JNIEnv *env, jobject vpn_inst, const char *key) { /* ******************************************************* */ -static struct in6_addr getIPv6Pref(JNIEnv *env, jobject vpn_inst, const char *key) { +struct in6_addr getIPv6Pref(JNIEnv *env, jobject vpn_inst, const char *key) { struct in6_addr addr = {0}; jmethodID midMethod = jniGetMethodID(env, cls.vpn_service, key, "()Ljava/lang/String;"); @@ -194,7 +194,7 @@ static struct in6_addr getIPv6Pref(JNIEnv *env, jobject vpn_inst, const char *ke /* ******************************************************* */ -static jint getIntPref(JNIEnv *env, jobject vpn_inst, const char *key) { +int getIntPref(JNIEnv *env, jobject vpn_inst, const char *key) { jint value; jmethodID midMethod = jniGetMethodID(env, cls.vpn_service, key, "()I"); diff --git a/app/src/main/jni/vpnproxy-jni/vpnproxy.h b/app/src/main/jni/vpnproxy-jni/vpnproxy.h index 95947bcf..ec1740ae 100644 --- a/app/src/main/jni/vpnproxy-jni/vpnproxy.h +++ b/app/src/main/jni/vpnproxy-jni/vpnproxy.h @@ -194,7 +194,11 @@ int resolve_uid(vpnproxy_data_t *proxy, const zdtun_5tuple_t *conn_info); void refresh_time(vpnproxy_data_t *proxy); void init_protocols_bitmask(ndpi_protocol_bitmask_struct_t *b); void vpn_protect_socket(vpnproxy_data_t *proxy, socket_t sock); + char* getStringPref(vpnproxy_data_t *proxy, const char *key, char *buf, int bufsize); +int getIntPref(JNIEnv *env, jobject vpn_inst, const char *key); +uint32_t getIPv4Pref(JNIEnv *env, jobject vpn_inst, const char *key); +struct in6_addr getIPv6Pref(JNIEnv *env, jobject vpn_inst, const char *key); int run_proxy(vpnproxy_data_t *proxy); int run_root(vpnproxy_data_t *proxy); diff --git a/app/src/main/res/layout/apps_stats.xml b/app/src/main/res/layout/apps_stats.xml index f0c68bed..2889fbd2 100644 --- a/app/src/main/res/layout/apps_stats.xml +++ b/app/src/main/res/layout/apps_stats.xml @@ -8,7 +8,8 @@ android:layout_height="match_parent" android:scrollbars="vertical" android:scrollbarStyle="outsideOverlay" - android:id="@+id/apps_stats_view" /> + android:id="@+id/apps_stats_view" + android:fillViewport="true" /> + android:scrollbarStyle="outsideOverlay" + android:fillViewport="true" /> + app:popupTheme="@style/PopupOverlay" /> @@ -43,7 +43,12 @@ + android:layout_height="0dp" + android:layout_weight="1" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index de6591a2..0dad277e 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -1,9 +1,16 @@ + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_height="0dp" + android:layout_weight="1" /> + + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7d70137f..8b3a9e5a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -74,7 +74,7 @@ Impossibile scrivere il file Condividi Elimina - Ok + OK Traffico salvato nel file %1$s (%2$s). Impossibile eliminare il file Cattura in esecuzione diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3addcae7..d8fe0d3e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -83,7 +83,7 @@ Cannot write file Share Delete - Ok + OK Traffic saved to file %1$s (%2$s). Could not delete file Capture running