Cleanup build.gradle

Author: mxszym-dolby

app/build.gradle

@@ -3,14 +3,10 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
-
-
-
 // Load values from SA properties file.
 def propsFile = rootProject.file('sa.properties')
 def props = new Properties()
 props.load(new FileInputStream(propsFile))
-
 repositories {
     mavenLocal()
     // Millicast SDK via Maven from GitHub Packages
@@ -33,13 +29,13 @@ android {
             keyPassword props['keyPassword']
         }
     }
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.millicast.android_java_sdk_sa"
         minSdkVersion 33
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 11
         versionName "1.7.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -72,14 +68,14 @@ dependencies {
     implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'io.dolby:promise:2.9.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Add Millicast SDK via one of the methods below.
     // For download via Maven from GitHub Packages:
     implementation 'com.millicast:millicast-sdk-android:1.7.0'
-    implementation 'io.dolby:promise:2.9.0'
     // For manual addition of AAR file:
     // implementation project(":MillicastSDK")
 }

app/src/main/java/com/millicast/android_app/MillicastManager.java

@@ -1178,9 +1178,8 @@ public boolean setAudioPlaybackIndex(int newValue) {
         // If currently subscribing, do not set new audioSourceIndex.
         if (isSubscribing()) {
             logD(TAG, logTag + "NOT setting to " + newValue + " as currently subscribing.");
-            //TODO implement this
-            logD(TAG, logTag + "AudioPlayback:" + "IMPLEMENT THIS");
-            //getAudioSourceStr(audioPlayback.toString(), true));
+            logD(TAG, logTag + "AudioPlayback:" + "");
+            getAudioPlaybackStr(audioPlayback, true);
             return false;
         }
 
@@ -1412,7 +1411,6 @@ public boolean isNdiOutputEnabled(boolean forAudio) {
             logD(TAG, logTag + "Flag: " + ndiEnabled + ", Track: Does not exist.");
             return ndiEnabled;
         }
-        //TODO reimplement this
         return ndiEnabled;
     }
 
@@ -1738,26 +1736,27 @@ public void startPub() {
 
         publisher.isConnected()
                 .then(connected -> {
-                    if (connected) {
-                        publisher.isPublishing()
-                                .then(publishing -> {
-                                    if (publishing) {
-                                        logD(TAG, logTag + "Not publishing as we are already publishing!");
-                                    } else {
-                                        if (!isAudioVideoCaptured()) {
-                                            logD(TAG, logTag + "Failed! Both audio & video are not captured.");
-                                        } else {
-                                            logD(TAG, logTag + "Trying...");
-                                            startPubMc();
-                                        }
-                                    }
-                                })
-                                .error(e -> {
-                                    logD(TAG, logTag + e.getLocalizedMessage());
-                                });
-                    } else {
-//TODO CLEAN THIS UP
+                    if (!connected) {
+                        logD(TAG, logTag + "Not publishing as we are not connected!");
+                        return;
                     }
+                    publisher.isPublishing()
+                            .then(publishing -> {
+                                if (publishing) {
+                                    logD(TAG, logTag + "Not publishing as we are already publishing!");
+                                    return;
+                                }
+                                if (!isAudioVideoCaptured()) {
+                                    logD(TAG, logTag + "Failed! Both audio & video are not captured.");
+                                    return;
+                                }
+                                logD(TAG, logTag + "Trying...");
+                                startPubMc();
+                            })
+                            .error(e -> {
+                                logD(TAG, logTag + e.getLocalizedMessage());
+                            });
+
                 }).error(e -> {
                     logD(TAG, logTag + e.getLocalizedMessage());
                 });
@@ -2395,7 +2394,7 @@ public int getSelectedIndex(ArrayList list) {
      * @return
      */
 
-    //TODO clean this up
+    //TODO clean up
 //    public boolean addMediaTrack(boolean isAudio) {
 //        TrackType kind = TrackType.Audio;
 //        if (!isAudio) {

app/src/main/java/com/millicast/android_app/compat/SubscriberCompat.kt

@@ -29,7 +29,6 @@ class SubscriberCompat(subscriberListener: SubscriberListener) : CompatBase() {
     fun connect() =  promise {
         stateChange();
         activityChange()
-        layersChange()
         onTrack();
         onLayers();
         onVad();
@@ -87,12 +86,6 @@ class SubscriberCompat(subscriberListener: SubscriberListener) : CompatBase() {
     }
     }
 
-    fun layersChange() = scope.launch {
-        subscriber.layers.distinctUntilChanged().collect{
-            newLayers ->
-                listener.onLayers(newLayers.mid,newLayers.activeLayers,newLayers.inactiveLayersEncodingIds)
-        }
-    }
 
     private fun onTrack() = scope.launch {
             subscriber.track.collect() { holder ->