Merge branch 'develop'

Author: tagavari

app/build.gradle

@@ -52,8 +52,8 @@ android {
 		applicationId "me.tagavari.airmessage"
 		minSdkVersion 23
 		targetSdkVersion 31
-		versionName "3.4.1"
-		versionCode 134
+		versionName "3.4.2"
+		versionCode 135
 
 		resConfigs "en", "fr", "ja"
 
@@ -185,10 +185,10 @@ dependencies {
 	implementation "com.google.android.gms:play-services-auth:20.0.1"
 
 	//CameraX
-	def camerax_version = "1.0.1"
+	def camerax_version = "1.1.0-beta02"
 	implementation "androidx.camera:camera-camera2:$camerax_version"
 	implementation "androidx.camera:camera-lifecycle:$camerax_version"
-	implementation "androidx.camera:camera-view:1.0.0-alpha31"
+	implementation "androidx.camera:camera-view:$camerax_version"
 
 
 	//About libraries

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
 	<!-- Dangerous permissions -->
 	<uses-permission android:name="android.permission.CAMERA" />
@@ -228,7 +229,8 @@
 			android:name=".activity.FaceTimeCall"
 			android:parentActivityName=".activity.CallHistory"
 			android:theme="@style/ThemeFaceTime"
-			android:documentLaunchMode="intoExisting">
+			android:documentLaunchMode="intoExisting"
+			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
 			<meta-data android:name="WindowManagerPreference:SuppressWindowControlNavigationButton" android:value="true" />
 		</activity>
 

app/src/main/java/me/tagavari/airmessage/fragment/FragmentCallActive.kt

@@ -1,5 +1,6 @@
 package me.tagavari.airmessage.fragment
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Base64
 import android.view.View
@@ -25,6 +26,7 @@ class FragmentCallActive : FragmentCommunication<FragmentCommunicationFaceTime>(
 		faceTimeLink = requireArguments().getString(PARAM_LINK)!!
 	}
 
+	@SuppressLint("SetJavaScriptEnabled")
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 

app/src/main/java/me/tagavari/airmessage/fragment/FragmentCallPending.kt

@@ -2,6 +2,7 @@ package me.tagavari.airmessage.fragment
 
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.content.res.Configuration
 import android.graphics.Typeface
 import android.os.Bundle
 import android.view.View
@@ -93,6 +94,25 @@ class FragmentCallPending : FragmentCommunication<FragmentCommunicationFaceTime>
 			communicationsCallback?.acceptCall()
 		}
 
+		//Initialize the camera
+		initializeCamera()
+		
+		//Subscribe to connection updates
+		compositeDisposable.add(
+			ReduxEmitterNetwork.connectionStateSubject.subscribe { update ->
+				buttonAcceptCall.isEnabled = update is ReduxEventConnection.Connected
+			}
+		)
+	}
+	
+	override fun onConfigurationChanged(newConfig: Configuration) {
+		super.onConfigurationChanged(newConfig)
+		
+		//Reinitialize the camera
+		initializeCamera()
+	}
+	
+	private fun initializeCamera() {
 		//Start the camera preview
 		val cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext())
 		cameraProviderFuture.addListener({
@@ -116,13 +136,6 @@ class FragmentCallPending : FragmentCommunication<FragmentCommunicationFaceTime>
 				exception.printStackTrace()
 			}
 		}, ContextCompat.getMainExecutor(requireContext()))
-		
-		//Subscribe to connection updates
-		compositeDisposable.add(
-			ReduxEmitterNetwork.connectionStateSubject.subscribe { update ->
-				buttonAcceptCall.isEnabled = update is ReduxEventConnection.Connected
-			}
-		)
 	}
 
 	/**

app/src/main/java/me/tagavari/airmessage/helper/NotificationHelper.kt

@@ -146,10 +146,10 @@ object NotificationHelper {
 				enableLights(false)
 				setSound(RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.TYPE_RINGTONE),
 					AudioAttributes.Builder()
-					.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-					.setLegacyStreamType(AudioManager.STREAM_RING)
-					.setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-					.build())
+						.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+						.setLegacyStreamType(AudioManager.STREAM_RING)
+						.setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+						.build())
 			}
 		)
 	}

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "com.android.tools.build:gradle:7.1.1"
+		classpath "com.android.tools.build:gradle:7.1.2"
 		classpath "com.google.gms:google-services:4.3.10"
 		classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"