mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-08-03 22:59:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'allow-proxies' into 'master'

Browse source 
Allow proxies

See merge request videostreaming/grayjay!9
This commit is contained in:
Gabe Rogan 2024-05-27 10:30:16 +00:00
commit a74dda12df
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/assets/devportal/dev_bridge.js
View file

@ -42,7 +42,7 @@ class RemoteObject {
return remoteCall(me.__id, methodName, Array.from(arguments)); return remoteCall(me.__id, methodName, Array.from(arguments));
} }
catch(ex) { catch(ex) {
if(ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) { if(ex.indexOf && ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) {
deletePackage(me.__id); deletePackage(me.__id);
} }
else throw ex; else throw ex;
@ -61,7 +61,7 @@ class RemoteObject {
return remoteProp(me.__id, propName); return remoteProp(me.__id, propName);
} }
catch(ex) { catch(ex) {
if(ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) { if(ex.indexOf && ex.indexOf("[400]") > 0 && ex.indexOf("does not exist") > 0 && ex.indexOf(me.__id) > 0) {
deletePackage(me.__id); deletePackage(me.__id);
} }
else throw ex; else throw ex;

2
app/src/unstable/AndroidManifest.xml
View file

@ -4,7 +4,7 @@
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<application> <application android:networkSecurityConfig="@xml/network_security_config">
<receiver android:name=".receivers.InstallReceiver" /> <receiver android:name=".receivers.InstallReceiver" />
<activity android:name=".activities.MainActivity"> <activity android:name=".activities.MainActivity">

17
app/src/unstable/res/xml/network_security_config.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<debug-overrides>
<trust-anchors>
<!-- Trust user added CAs while debuggable only -->
<certificates src="user" />
<certificates src="system" />
</trust-anchors>
</debug-overrides>
<base-config cleartextTrafficPermitted="true">
<trust-anchors>
<certificates src="system" />
<certificates src="user" />
</trust-anchors>
</base-config>
</network-security-config>