Removed multicast lock again.

app/src/main/java/com/futo/platformplayer/Settings.kt

@@ -478,7 +478,6 @@ class Settings : FragmentedStorageFileJson() {
         var preferWebmAudio: Boolean = false;
 
         @FormField(R.string.allow_under_cutout, FieldForm.TOGGLE, R.string.allow_under_cutout_description, 16)
-        @FormFieldWarning(R.string.changing_this_field_requires_restart)
         var allowVideoToGoUnderCutout: Boolean = true;
     }
 

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -7,6 +7,7 @@ import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.net.Uri
+import android.net.wifi.WifiManager
 import android.os.Bundle
 import android.os.StrictMode
 import android.os.StrictMode.VmPolicy
@@ -253,7 +254,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         setContentView(R.layout.activity_main);
         setNavigationBarColorAndIcons();
 
-
         runBlocking {
             StatePlatform.instance.updateAvailableClients(this@MainActivity);
         }
@@ -514,7 +514,6 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-
     /*
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);

app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/JSArticle.kt

@@ -0,0 +1,78 @@
+package com.futo.platformplayer.api.media.platforms.js.models
+
+import com.caoccao.javet.values.reference.V8ValueObject
+import com.futo.platformplayer.api.media.IPluginSourced
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.post.TextType
+import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.getOrDefault
+import com.futo.platformplayer.getOrThrow
+import com.futo.platformplayer.getOrThrowNullableList
+import kotlin.streams.toList
+
+open class JSArticle : JSContent, IPluginSourced {
+    final override val contentType: ContentType get() = ContentType.POST;
+
+    val summary: String;
+    val thumbnails: Thumbnails?;
+    val segments: List<IJSArticleSegment>;
+
+    constructor(config: SourcePluginConfig, obj: V8ValueObject): super(config, obj) {
+        val contextName = "PlatformPost";
+
+        summary = _content.getOrThrow(config, "summary", contextName);
+        if(_content.has("thumbnails"))
+            thumbnails = Thumbnails.fromV8(config, _content.getOrThrow(config, "thumbnails", contextName));
+        else
+            thumbnails = null;
+
+
+        segments = (obj.getOrThrowNullableList<V8ValueObject>(config, "segments", contextName)
+            ?.map { fromV8Segment(config, it) }
+            ?.filterNotNull() ?: listOf());
+    }
+
+
+    companion object {
+        fun fromV8Segment(config: SourcePluginConfig, obj: V8ValueObject): IJSArticleSegment? {
+            if(!obj.has("type"))
+                throw IllegalArgumentException("Object missing type field");
+            return when(obj.getOrThrow<SegmentType>(config, "type", "JSArticle.Segment")) {
+                SegmentType.TEXT -> JSTextSegment(config, obj);
+                SegmentType.IMAGES -> JSImagesSegment(config, obj);
+                else -> null;
+            }
+        }
+    }
+}
+
+enum class SegmentType(i: Int) {
+    UNKNOWN(0),
+    TEXT(1),
+    IMAGES(2)
+}
+
+interface IJSArticleSegment {
+    val type: SegmentType;
+}
+class JSTextSegment: IJSArticleSegment {
+    override val type = SegmentType.TEXT;
+    val textType: TextType;
+    val content: String;
+
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) {
+        val contextName = "JSTextSegment";
+        textType = TextType.fromInt((obj.getOrDefault<Int>(config, "textType", contextName, null) ?: 0));
+        content = obj.getOrDefault(config, "content", contextName, "") ?: "";
+    }
+}
+class JSImagesSegment: IJSArticleSegment {
+    override val type = SegmentType.IMAGES;
+    val images: List<String>;
+
+    constructor(config: SourcePluginConfig, obj: V8ValueObject) {
+        val contextName = "JSTextSegment";
+        images = obj.getOrThrowNullableList<String>(config, "images", contextName) ?: listOf();
+    }
+}

app/src/main/java/com/futo/platformplayer/mdns/MDNSListener.kt

@@ -18,9 +18,9 @@ class MDNSListener {
     }
 
     private val _lockObject = ReentrantLock()
-    private var _receiver4: DatagramSocket? = null
-    private var _receiver6: DatagramSocket? = null
-    private val _senders = mutableListOf<DatagramSocket>()
+    private var _receiver4: MulticastSocket? = null
+    private var _receiver6: MulticastSocket? = null
+    private val _senders = mutableListOf<MulticastSocket>()
     private val _nicMonitor = NICMonitor()
     private val _serviceRecordAggregator = ServiceRecordAggregator()
     private var _started = false
@@ -53,13 +53,13 @@ class MDNSListener {
 
         Logger.i(TAG, "Starting")
         _lockObject.withLock {
-            val receiver4 = DatagramSocket(null).apply {
+            val receiver4 = MulticastSocket(null).apply {
                 reuseAddress = true
                 bind(InetSocketAddress(InetAddress.getByName("0.0.0.0"), MulticastPort))
             }
             _receiver4 = receiver4
 
-            val receiver6 = DatagramSocket(null).apply {
+            val receiver6 = MulticastSocket(null).apply {
                 reuseAddress = true
                 bind(InetSocketAddress(InetAddress.getByName("::"), MulticastPort))
             }
@@ -166,6 +166,11 @@ class MDNSListener {
                 try {
                     when (address) {
                         is Inet4Address -> {
+                            _receiver4?.let { receiver4 ->
+                                //receiver4.setOption(StandardSocketOptions.IP_MULTICAST_IF, NetworkInterface.getByInetAddress(address))
+                                receiver4.joinGroup(InetSocketAddress(MulticastAddressIPv4, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+
                             val sender = MulticastSocket(null).apply {
                                 reuseAddress = true
                                 bind(InetSocketAddress(address, MulticastPort))
@@ -175,6 +180,11 @@ class MDNSListener {
                         }
 
                         is Inet6Address -> {
+                            _receiver6?.let { receiver6 ->
+                                //receiver6.setOption(StandardSocketOptions.IP_MULTICAST_IF, NetworkInterface.getByInetAddress(address))
+                                receiver6.joinGroup(InetSocketAddress(MulticastAddressIPv6, MulticastPort), NetworkInterface.getByInetAddress(address))
+                            }
+
                             val sender = MulticastSocket(null).apply {
                                 reuseAddress = true
                                 bind(InetSocketAddress(address, MulticastPort))
@@ -222,7 +232,7 @@ class MDNSListener {
     private fun receiveLoop(client: DatagramSocket) {
         Logger.i(TAG, "Started receive loop")
 
-        val buffer = ByteArray(1024)
+        val buffer = ByteArray(8972)
         val packet = DatagramPacket(buffer, buffer.size)
         while (_started) {
             try {

app/src/main/java/com/futo/platformplayer/receivers/MediaControlReceiver.kt

@@ -10,7 +10,6 @@ import com.futo.platformplayer.constructs.Event1
 
 
 class MediaControlReceiver : BroadcastReceiver() {
-
     override fun onReceive(context: Context?, intent: Intent?) {
         val act = intent?.getStringExtra(EXTRA_MEDIA_ACTION);
         Logger.i(TAG, "Received MediaControl Event $act");

app/src/main/java/com/futo/platformplayer/services/MediaPlaybackService.kt

@@ -58,6 +58,8 @@ class MediaPlaybackService : Service() {
     private var _focusRequest: AudioFocusRequest? = null;
     private var _audioFocusLossTime_ms: Long? = null
     private var _playbackState = PlaybackStateCompat.STATE_NONE;
+    private val _handler = Handler(Looper.getMainLooper())
+    private val _audioFocusRunnable = Runnable { setAudioFocus(false) }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Logger.v(TAG, "onStartCommand");
@@ -161,6 +163,8 @@ class MediaPlaybackService : Service() {
 
         val focusRequest = _focusRequest;
         if (focusRequest != null) {
+            Logger.i(TAG, "Audio focus abandoned")
+            _handler.removeCallbacks(_audioFocusRunnable)
             _audioManager?.abandonAudioFocusRequest(focusRequest);
             _focusRequest = null;
         }
@@ -342,22 +346,46 @@ class MediaPlaybackService : Service() {
     }
 
     //TODO: (TBD) This code probably more fitting inside FutoVideoPlayer, as this service is generally only used for global events
-    private fun setAudioFocus() {
-        Log.i(TAG, "Requested audio focus.");
+    private fun setAudioFocus(createFocusRequest: Boolean = true) {
+        _handler.removeCallbacks(_audioFocusRunnable)
 
-        val focusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-            .setAcceptsDelayedFocusGain(true)
-            .setOnAudioFocusChangeListener(_audioFocusChangeListener)
-            .build()
+        if (_hasFocus) {
+            Log.i(TAG, "Skipped trying to get audio focus because audio focus is already obtained.");
+            return;
+        }
 
-        _focusRequest = focusRequest;
-        val result = _audioManager?.requestAudioFocus(focusRequest)
+        if (_focusRequest == null) {
+            if (!createFocusRequest) {
+                Log.i(TAG, "Skipped trying to get audio focus because createFocusRequest = false and no focus request exists.");
+                return;
+            }
+
+            val focusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                .setAcceptsDelayedFocusGain(true)
+                .setOnAudioFocusChangeListener(_audioFocusChangeListener)
+                .build()
+
+            _focusRequest = focusRequest;
+            Log.i(TAG, "Created audio focus request.");
+        }
+
+        Log.i(TAG, "Requesting audio focus.");
+
+        val result = _audioManager?.requestAudioFocus(_focusRequest!!)
         Log.i(TAG, "Audio focus request result $result");
         if (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
-            //TODO: Handle when not possible to get audio focus
             _hasFocus = true;
             Log.i(TAG, "Audio focus received");
+        } else if (result == AudioManager.AUDIOFOCUS_REQUEST_DELAYED) {
+            _hasFocus = false
+            Log.i(TAG, "Audio focus delayed, waiting for focus")
+        } else {
+            _hasFocus = false
+            Log.i(TAG, "Audio focus not granted, retrying in 1 second")
+            _handler.postDelayed(_audioFocusRunnable, 1000)
         }
+
+        Log.i(TAG, "Audio focus requested.");
     }
 
     private val _audioFocusChangeListener =
@@ -365,8 +393,7 @@ class MediaPlaybackService : Service() {
             try {
                 when (focusChange) {
                     AudioManager.AUDIOFOCUS_GAIN -> {
-                        //Do not start playing on gaining audo focus
-                        //MediaControlReceiver.onPlayReceived.emit();
+                        _handler.removeCallbacks(_audioFocusRunnable)
                         _hasFocus = true;
                         Log.i(TAG, "Audio focus gained (restartPlaybackAfterLoss = ${Settings.instance.playback.restartPlaybackAfterLoss}, _audioFocusLossTime_ms = $_audioFocusLossTime_ms)");
 
@@ -385,7 +412,6 @@ class MediaPlaybackService : Service() {
                         }
                     }
                     AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
-                        MediaControlReceiver.onPauseReceived.emit();
                         if (_playbackState != PlaybackStateCompat.STATE_PAUSED &&
                             _playbackState != PlaybackStateCompat.STATE_STOPPED &&
                             _playbackState != PlaybackStateCompat.STATE_NONE &&
@@ -393,10 +419,13 @@ class MediaPlaybackService : Service() {
                             _audioFocusLossTime_ms = System.currentTimeMillis()
                         }
 
-                        Log.i(TAG, "Audio focus transient loss");
+                        _hasFocus = false;
+                        MediaControlReceiver.onPauseReceived.emit();
+                        Log.i(TAG, "Audio focus transient loss (_audioFocusLossTime_ms = ${_audioFocusLossTime_ms})");
                     }
                     AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
                         Log.i(TAG, "Audio focus transient loss, can duck");
+                        _hasFocus = true;
                     }
                     AudioManager.AUDIOFOCUS_LOSS -> {
                         if (_playbackState != PlaybackStateCompat.STATE_PAUSED &&
@@ -409,16 +438,6 @@ class MediaPlaybackService : Service() {
                         _hasFocus = false;
                         MediaControlReceiver.onPauseReceived.emit();
                         Log.i(TAG, "Audio focus lost");
-
-                        val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-                        val runningAppProcesses = activityManager.runningAppProcesses
-                        for (processInfo in runningAppProcesses) {
-                            // Check the importance of the running app process
-                            if (processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
-                                // This app is in the foreground, which might have caused the loss of audio focus
-                                Log.i("AudioFocus", "App ${processInfo.processName} might have caused the loss of audio focus")
-                            }
-                        }
                     }
                 }
             } catch(ex: Throwable) {

app/src/main/java/com/futo/platformplayer/views/fields/Field.kt

@@ -13,6 +13,10 @@ annotation class FormField(val title: Int, val type: String, val subtitle: Int =
 @Retention(AnnotationRetention.RUNTIME)
 annotation class FormFieldWarning(val messageRes: Int)
 
+@Target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FormFieldHint(val messageRes: Int)
+
 interface IField {
     var descriptor: FormField?;
     val obj : Any?;

app/src/main/java/com/futo/platformplayer/views/fields/FieldForm.kt

@@ -293,6 +293,12 @@ class FieldForm : LinearLayout {
                                     }, UIDialogs.ActionStyle.PRIMARY));
                         }
                     }
+                    val hint = propertyMap[field.field]?.findAnnotation<FormFieldHint>();
+                    if(hint != null){
+                        field.onChanged.subscribe { f, value, oldValue ->
+                            UIDialogs.appToast(context.getString(hint.messageRes), false);
+                        }
+                    }
                 }
             }
 

app/src/main/res/values/strings.xml

@@ -378,7 +378,7 @@
     <string name="prefer_webm_audio">Prefer Webm Audio Codecs</string>
     <string name="prefer_webm_audio_description">If player should prefer Webm codecs (opus) over mp4 codecs (AAC), may result in worse compatibility.</string>
     <string name="allow_under_cutout">Allow video under cutout</string>
-    <string name="allow_under_cutout_description">Allow video to go underneath the screen cutout in full-screen.</string>
+    <string name="allow_under_cutout_description">Allow video to go underneath the screen cutout in full-screen.\nMay require restart</string>
     <string name="allow_full_screen_portrait">Allow fullscreen portrait</string>
     <string name="background_switch_audio">Switch to Audio in Background</string>
     <string name="background_switch_audio_description">Optimize bandwidth usage by switching to audio-only stream in background if available, may cause stutter</string>