Update AndroidManifest.xml

shogo4405 · Apr 1, 2024 · 6452345 · 6452345
1 parent ad29d38
commit 6452345
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 324 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,15 @@
 
     <uses-sdk tools:overrideLibrary="com.haishinkit.vulkan" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- Require Android14 and targetSdkVersion 34 -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"

diff --git a/app/src/main/java/com/haishinkit/app/CameraTabFragment.kt b/app/src/main/java/com/haishinkit/app/CameraTabFragment.kt
@@ -69,28 +69,28 @@ class CameraTabFragment : Fragment(), IEventListener {
     private val callback: Screen.Callback by lazy { Callback(this) }
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        activity?.let {
-            val permissionCheck = ContextCompat.checkSelfPermission(it, Manifest.permission.CAMERA)
-            if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(it, arrayOf(Manifest.permission.CAMERA), 1)
-            }
-            if (ContextCompat.checkSelfPermission(
-                    it,
-                    Manifest.permission.RECORD_AUDIO
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                ActivityCompat.requestPermissions(it, arrayOf(Manifest.permission.RECORD_AUDIO), 1)
-            }
+
+        val permissionCheck = ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.CAMERA)
+        if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.CAMERA), 1)
         }
+        if (ContextCompat.checkSelfPermission(
+                requireActivity(),
+                Manifest.permission.RECORD_AUDIO
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.RECORD_AUDIO), 1)
+        }
+
         connection = RtmpConnection()
         stream = RtmpStream(requireContext(), connection)
         stream.attachAudio(AudioRecordSource(requireContext()))
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // multiCamera = MultiCamera2Source(requireContext())
+            multiCamera = MultiCamera2Source(requireContext())
             stream.attachVideo(multiCamera)
         } else {
-            // cameraSource = Camera2Source(requireContext())
+            cameraSource = Camera2Source(requireContext())
             stream.attachVideo(cameraSource)
         }
 

diff --git a/app/src/main/java/com/haishinkit/app/MainActivity.kt b/app/src/main/java/com/haishinkit/app/MainActivity.kt
@@ -36,10 +36,6 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
                 fragment = PlaybackTabFragment.newInstance()
             }
 
-            R.id.navigation_dashboard -> {
-                fragment = PreferenceTagFragment.newInstance()
-            }
-
             else -> {
             }
         }

diff --git a/app/src/main/java/com/haishinkit/app/PlaybackTabFragment.kt b/app/src/main/java/com/haishinkit/app/PlaybackTabFragment.kt
@@ -31,6 +31,6 @@ class PlaybackTabFragment : Fragment() {
             return PlaybackTabFragment()
         }
 
-        private val TAG = PlaybackTabFragment::class.java.simpleName
+        private const val TAG = "PlaybackTabFragment"
     }
 }
diff --git a/app/src/main/java/com/haishinkit/app/PreferenceTagFragment.kt b/app/src/main/java/com/haishinkit/app/PreferenceTagFragment.kt
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
diff --git a/app/src/main/res/layout/fragment_preference.xml b/app/src/main/res/layout/fragment_preference.xml