Fixed Added encode uri password for RTSP stream

bluecherrydvr · Oct 9, 2021 · 5a546e6 · 5a546e6
1 parent 02f1437
commit 5a546e6
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 5 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -230,6 +230,6 @@ task copyDownloadableDepsToLibs(type: Copy) {
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 
 project.ext.vectoricons = [
-    iconFontNames: [ 'MaterialIcons.ttf']
+    iconFontNames: [ 'MaterialIcons.ttf','MaterialCommunityIcons.ttf']
 ]
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
diff --git a/android/build.gradle b/android/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "29.0.2"
-        minSdkVersion = 17
+        minSdkVersion = 21
         compileSdkVersion = 29
         targetSdkVersion = 29
     }

diff --git a/ios/BluecherryDvr.xcodeproj/project.pbxproj b/ios/BluecherryDvr.xcodeproj/project.pbxproj
@@ -254,6 +254,7 @@
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
 				55E78CC082DE139C639C7186 /* [CP] Copy Pods Resources */,
+				B73879FBDDF18E9949160523 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -277,6 +278,7 @@
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				9E0986266253E89F2DFB6D5E /* [CP] Copy Pods Resources */,
 				D5BADEF290052945487B7F2F /* [CP-User] [RNFB] Core Configuration */,
+				BB1EB677582704C98F86C4F6 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -604,6 +606,42 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BluecherryDvr/Pods-BluecherryDvr-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		B73879FBDDF18E9949160523 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-BluecherryDvr-BluecherryDvrTests/Pods-BluecherryDvr-BluecherryDvrTests-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BluecherryDvr-BluecherryDvrTests/Pods-BluecherryDvr-BluecherryDvrTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		BB1EB677582704C98F86C4F6 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-BluecherryDvr/Pods-BluecherryDvr-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BluecherryDvr/Pods-BluecherryDvr-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		D5BADEF290052945487B7F2F /* [CP-User] [RNFB] Core Configuration */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/ios/Podfile b/ios/Podfile
@@ -27,7 +27,7 @@ target 'BluecherryDvr' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable these next few lines.
-  use_flipper!({ 'Flipper-Folly' => '2.3.0' })
+  use_flipper!({ 'Flipper-Folly' => '2.5.0' })
   post_install do |installer|
     flipper_post_install(installer)
   end

diff --git a/lib/util.js b/lib/util.js
@@ -44,7 +44,7 @@ export function getAddressByCredentials({login, password, address, port = ''}, u
         host: address,
         port
     };
-    const url = new Url(useAccountInfo ? {...params, user:login, password} : params);
+    const url = new Url(useAccountInfo ? {...params, user:login, password: encodeURIComponent(password)} : params);
 
     return url.toString();
 }
@@ -56,7 +56,7 @@ export function getRtspAddressByCredentials({login, password, address, rtspAddre
         host: rtspAddress || address,
         port: rtspPort,
         user: login,
-        password
+        password: encodeURIComponent(password)
     });
 
     return url.toString();