diff --git a/android/Dockerfile b/android/Dockerfile index 2813e82..0521c96 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -9,7 +9,7 @@ RUN node --version RUN git clone https://github.com/httptoolkit/httptoolkit-server /httptoolkit-server WORKDIR /httptoolkit-server -RUN git checkout 5c60a70b08d30126639484314f5b5619a388b026 \ +RUN git checkout 490b1b6f5180ad634b60997778c5f96b2f62bf0b \ && npm i && npm run build:src # Set up proxy_cache_thing diff --git a/android/code/index.mjs b/android/code/index.mjs index 1c1fd34..b911125 100644 --- a/android/code/index.mjs +++ b/android/code/index.mjs @@ -73,12 +73,19 @@ io.on("connection", (socket) => { socket.on("back", async () => { if (gps_setting_in_progress) { send_notification(socket, false, "Interactions not allowed when setting gps coordinates", ""); - send_notification(socket, false, "Back", ""); return ; } await spawnPromise("bash", ["/conf/back.sh"]); }); + socket.on("recent", async () => { + if (gps_setting_in_progress) { + send_notification(socket, false, "Interactions not allowed when setting gps coordinates", ""); + return ; + } + await spawnPromise("bash", ["/conf/recent.sh"]); + }); + socket.on("home", async () => { if (gps_setting_in_progress) { send_notification(socket, false, "Interactions not allowed when setting gps coordinates", ""); diff --git a/android/conf/get_adid.sh b/android/conf/get_adid.sh index 896eceb..d4b1307 100644 --- a/android/conf/get_adid.sh +++ b/android/conf/get_adid.sh @@ -1 +1 @@ -adb shell su root cat /data/data/com.google.android.gms/shared_prefs/adid_settings.xml | xmllint --xpath 'string(//map/string[@name="adid_key"])' - +adb shell su root cat /data/data/com.google.android.gms/shared_prefs/adid_settings.xml | xmllint --xpath 'string(//map/string[@name="adid_key"])' - | tr -d $'\n' diff --git a/android/conf/recent.sh b/android/conf/recent.sh new file mode 100644 index 0000000..df3fb52 --- /dev/null +++ b/android/conf/recent.sh @@ -0,0 +1 @@ +/opt/android-sdk-linux/platform-tools/adb shell input keyevent 187 diff --git a/certgen/Dockerfile b/certgen/Dockerfile index 4089f2e..971ffad 100644 --- a/certgen/Dockerfile +++ b/certgen/Dockerfile @@ -3,7 +3,7 @@ FROM node:22.14.0 RUN git clone https://github.com/httptoolkit/httptoolkit-server WORKDIR /httptoolkit-server -RUN git checkout 5c60a70b08d30126639484314f5b5619a388b026 \ +RUN git checkout 490b1b6f5180ad634b60997778c5f96b2f62bf0b \ && npm i && npm run build:src CMD /httptoolkit-server/bin/run start -c /certificates diff --git a/http_server/code/docker-entrypoint.sh b/http_server/code/docker-entrypoint.sh index 8c58d63..8933c6c 100644 --- a/http_server/code/docker-entrypoint.sh +++ b/http_server/code/docker-entrypoint.sh @@ -2,5 +2,5 @@ npm i npm run build -node --watch index.mjs -#tail -f /dev/null +node index.mjs & +tail -f /dev/null diff --git a/http_server/code/index.html b/http_server/code/index.html index a58cc3b..007a1d4 100644 --- a/http_server/code/index.html +++ b/http_server/code/index.html @@ -4,154 +4,8 @@
+ Request + responce pairs: 0 +
++ Waiting for the responce: 0 +
+ADID: | -UNKNOWN | -
Longitude: | -UNKNOWN | -
Latitude: | -UNKNOWN | -
ADID: | +UNKNOWN | +
Longitude: | +UNKNOWN | +
Latitude: | +UNKNOWN | +