Merge branch 'development'

.github/workflows/unit-test-gradle.yml

@@ -0,0 +1,40 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  pull_request:
+    branches: [ "main", "development" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Checkout Common Library Dependency
+        uses: actions/checkout@v3
+        with:
+          repository: '5G-MAG/rt-5gms-common-android-library'
+          ref: 'development'
+      - name: Publish to dependency to MavenLocal
+        run: ./gradlew publishToMavenLocal
+      - name: Checkout main repo
+        uses: actions/checkout@v3
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+        with:
+          arguments: build

Readme.md

@@ -26,6 +26,21 @@ cd ~
 git clone https://github.com/5G-MAG/rt-5gms-media-session-handler.git
 ```
 
+## Install dependencies
+The 5GMSd Aware Application requires the [Common Android Library](https://github.com/5G-MAG/rt-5gms-common-android-library) to run.
+
+It is included as Maven dependencies in the `build.gradle`:
+
+````
+dependencies {
+   implementation 'com.fivegmag:a5gmscommonlibrary:1.0.0'
+}
+````
+
+To install the dependencies follow the  installation guides in the Readme documentation of the project. Make sure to publish it as a local Maven repository:
+
+* [Common Android Library](https://github.com/5G-MAG/rt-5gms-common-android-library#publish-to-local-maven-repository)
+
 ## Building
 
 Call the following command in order to generate the `apk` bundles.

app/build.gradle

@@ -12,7 +12,7 @@ android {
         minSdk 29
         targetSdk 33
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/fivegmag/a5gmsmediasessionhandler/MediaSessionHandlerMessengerService.kt

@@ -42,7 +42,7 @@ class MediaSessionHandlerMessengerService() : Service() {
     private lateinit var currentServiceAccessInformation: ServiceAccessInformation
 
     /** Keeps track of all current registered clients.  */
-    var mClients = ArrayList<Messenger>()
+    var mClients = ArrayList<Int>()
 
     /**
      * Handler of incoming messages from clients.
@@ -66,11 +66,11 @@ class MediaSessionHandlerMessengerService() : Service() {
         }
 
         private fun registerClient(msg: Message) {
-            mClients.add(msg.replyTo)
+            mClients.add(msg.sendingUid)
         }
 
         private fun unregisterClient(msg: Message) {
-            mClients.remove(msg.replyTo)
+            mClients.remove(msg.sendingUid)
         }
 
         private fun handleStatusMessage(msg: Message) {
@@ -133,10 +133,10 @@ class MediaSessionHandlerMessengerService() : Service() {
         private fun setM5Endpoint(msg: Message) {
             try {
                 val bundle: Bundle = msg.data
-                val m5Url: String? = bundle.getString("m5Url")
-                Log.i(TAG, "Setting M5 endpoint to $m5Url")
-                if (m5Url != null) {
-                    initializeRetrofitForServiceAccessInformation(m5Url)
+                val m5BaseUrl: String? = bundle.getString("m5BaseUrl")
+                Log.i(TAG, "Setting M5 endpoint to $m5BaseUrl")
+                if (m5BaseUrl != null) {
+                    initializeRetrofitForServiceAccessInformation(m5BaseUrl)
                 }
             } catch (e: Exception) {
             }

app/src/main/res/layout/activity_main.xml

@@ -6,14 +6,4 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:id="@+id/statusText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Status: disconnected"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#00A0D2</color>
+</resources>