Unconditionally set private key in getPsiphonConfig

Psiphon-Inc · Nov 12, 2024 · 4c5d223 · 4c5d223
1 parent ac7316d
commit 4c5d223
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/android/app/src/main/java/ca/psiphon/conduit/nativemodule/ConduitService.java b/android/app/src/main/java/ca/psiphon/conduit/nativemodule/ConduitService.java
@@ -199,20 +199,14 @@ public String getPsiphonConfig() {
                     .put("RotatingSyncFrequency", 0));
 
             // Set inproxy parameters that we stored in shared preferences earlier
-            String storedProxyPrivateKey = conduitServiceParameters.privateKey();
-            // Set only if not null, otherwise an ephemeral key will be generated internally
-            if (storedProxyPrivateKey != null) {
-                psiphonConfig.put("InproxyProxySessionPrivateKey", storedProxyPrivateKey);
-            }
+            // We trust that the parameters are valid as they were validated when they were loaded in the beginning of this method
+            psiphonConfig.put("InproxyProxySessionPrivateKey", conduitServiceParameters.privateKey());
 
-            int storedMaxClients = conduitServiceParameters.maxClients();
-            psiphonConfig.put("InproxyMaxClients", storedMaxClients);
+            psiphonConfig.put("InproxyMaxClients", conduitServiceParameters.maxClients());
 
-            int storedLimitUpstream = conduitServiceParameters.limitUpstreamBytes();
-            psiphonConfig.put("InproxyLimitUpstreamBytesPerSecond", storedLimitUpstream);
+            psiphonConfig.put("InproxyLimitUpstreamBytesPerSecond", conduitServiceParameters.limitUpstreamBytes());
 
-            int storedLimitDownstream = conduitServiceParameters.limitDownstreamBytes();
-            psiphonConfig.put("InproxyLimitDownstreamBytesPerSecond", storedLimitDownstream);
+            psiphonConfig.put("InproxyLimitDownstreamBytesPerSecond", conduitServiceParameters.limitDownstreamBytes());
 
             // Convert back to json string
             return psiphonConfig.toString();