From 7e6c6277755f784a40ffd0d1f18349e9c97e5ce5 Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 20 Nov 2024 21:55:56 +0800 Subject: [PATCH] chore_: add env STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS https://github.com/status-im/status-go/compare/b3dbe91b...cae9d35d --- shadow-cljs.edn | 2 ++ src/status_im/config.cljs | 3 +++ src/status_im/contexts/profile/events.cljs | 10 ++++++---- status-go-version.json | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 584d9b3061..0283dab696 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -71,6 +71,8 @@ status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD" status-im.config/STATUS_BACKEND_SERVER_ENABLED #shadow/env "STATUS_BACKEND_SERVER_ENABLED" status-im.config/STATUS_BACKEND_SERVER_HOST #shadow/env "STATUS_BACKEND_SERVER_HOST" + status-im.config/STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS + #shadow/env "STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS" status-im.config/STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX #shadow/env "STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX" status-im.config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR #shadow/env diff --git a/src/status_im/config.cljs b/src/status_im/config.cljs index d5a6db73c3..3ccdf9480e 100644 --- a/src/status_im/config.cljs +++ b/src/status_im/config.cljs @@ -136,6 +136,9 @@ ;; The port comes from your running status backend server. ;; If you run it by PORT=60000 make run-status-backend , then host will likely be 127.0.0.1:60000 (goog-define STATUS_BACKEND_SERVER_HOST "") +;; enable media server over https or http +;; if you're using android simulator, set it to "0" +(goog-define STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS "1") ;; /path/to/root/data/dir ;; make sure it exists, it should be in absolute path (goog-define STATUS_BACKEND_SERVER_ROOT_DATA_DIR "") diff --git a/src/status_im/contexts/profile/events.cljs b/src/status_im/contexts/profile/events.cljs index 2bc418178a..af1e6c3a5d 100644 --- a/src/status_im/contexts/profile/events.cljs +++ b/src/status_im/contexts/profile/events.cljs @@ -32,10 +32,12 @@ (rf/reg-fx :profile/get-profiles-overview (fn [callback] - (native-module/initialize-application {:dataDir (native-module/backup-disabled-data-dir) - :mixpanelAppId config/mixpanel-app-id - :mixpanelToken config/mixpanel-token} - callback))) + (native-module/initialize-application + {:dataDir (native-module/backup-disabled-data-dir) + :mixpanelAppId config/mixpanel-app-id + :mixpanelToken config/mixpanel-token + :mediaServerEnableTLS (config/enabled? config/STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS)} + callback))) (rf/reg-event-fx :profile/profile-selected diff --git a/status-go-version.json b/status-go-version.json index 5d4531fb4c..98e838c4c9 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v3.9.0", - "commit-sha1": "79e662e4a563d650358e778871dc20ed71b0eb33", - "src-sha256": "035hz6pn0hkbb2383bdzmzdg214yjkv3aax6bq3dzvyxz002p0m7" + "version": "chore/http_media_server", + "commit-sha1": "cae9d35daba66dee5b20a95cc244872d48934814", + "src-sha256": "0vilpalx0ackrg2pdx57br6rsq52508520kkdklkfjijlfasawdh" }