Merge pull request #197 from tobexyz/feat/issue105

Feat/issue105

Author: tobexyz

yaacc/build.gradle

@@ -11,6 +11,14 @@ apply plugin: 'com.android.application'
 
 dependencies {
 
+    configurations.all {
+        resolutionStrategy {
+            force 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
+            force 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10'
+            force 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10'
+        }
+    }
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:4.11.0'
     testImplementation 'com.tngtech.junit.dataprovider:junit4-dataprovider:2.10'
@@ -24,6 +32,13 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.media:media:1.6.0'
+    implementation 'androidx.media3:media3-session:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer:1.2.0'
+    implementation 'androidx.media3:media3-ui:1.2.0'
+    implementation('androidx.mediarouter:mediarouter:1.6.0') {
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+    }
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
     implementation 'org.mp4parser:isoparser:1.9.56'
@@ -33,7 +48,7 @@ dependencies {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
 
     sourceSets {

yaacc/src/main/AndroidManifest.xml

@@ -61,14 +61,15 @@
             </intent-filter>
         </activity>
 
-
         <service
             android:name=".player.PlayerService"
             android:enabled="true"
-            android:exported="false" />
-        <service
-            android:name=".musicplayer.BackgroundMusicService"
-            android:enabled="true" />
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService" />
+            </intent-filter>
+        </service>
         <service
             android:name=".upnp.server.YaaccUpnpServerService"
             android:enabled="true"

yaacc/src/main/java/de/yaacc/Yaacc.java

@@ -30,7 +30,6 @@
 import android.os.BatteryManager;
 import android.os.CountDownTimer;
 import android.os.PowerManager;
-import de.yaacc.util.YaaccLogger;
 
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.NotificationCompat;
@@ -43,11 +42,9 @@
 import java.util.stream.Collectors;
 
 import de.yaacc.browser.TabBrowserActivity;
-import de.yaacc.musicplayer.BackgroundMusicService;
 import de.yaacc.player.PlayerService;
 import de.yaacc.upnp.UpnpClient;
 import de.yaacc.upnp.server.YaaccUpnpServerService;
-import de.yaacc.upnp.server.renderingcontrol.YaaccAudioRenderingControlService;
 import de.yaacc.util.NotificationId;
 import de.yaacc.util.SafPermissionManager;
 import de.yaacc.util.ShutdownTimerListener;
@@ -92,9 +89,9 @@ public void onCreate() {
         // Always start with streaming disabled
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
             preferences.edit()
-                .putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), false)
-                .putBoolean(getString(R.string.settings_local_server_serve_screen_cast_chkbx), false)
-                .apply();
+                    .putBoolean(getString(R.string.settings_local_server_serve_system_audio_chkbx), false)
+                    .putBoolean(getString(R.string.settings_local_server_serve_screen_cast_chkbx), false)
+                    .apply();
         }
 
         // Validate and cleanup SAF permissions on app startup
@@ -133,8 +130,6 @@ public void exit() {
         SharedPreferences.Editor editor = preferences.edit();
         proxyLinks.forEach(k -> editor.remove(k).commit());
         stopService(new Intent(this, PlayerService.class));
-        stopService(new Intent(this, BackgroundMusicService.class));
-        stopService(new Intent(this, YaaccAudioRenderingControlService.class));
         stopService(new Intent(this, YaaccUpnpServerService.class));
 
 
@@ -145,16 +140,26 @@ public void exit() {
         mNotificationManager.cancel(NotificationId.YAACC.getId());
         ActivityManager am = (ActivityManager) getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
         am.getAppTasks().stream().forEach(t -> t.finishAndRemoveTask());
+        clearCache();
         Runtime.getRuntime().exit(0);
     }
 
+    private void clearCache() {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        Set<String> tobeDeleted = preferences.getAll().keySet().stream().filter(k -> k.startsWith(getApplicationContext().getString(R.string.settings_duration_format_key))).collect(Collectors.toSet());
+        SharedPreferences.Editor edit = preferences.edit();
+        tobeDeleted.forEach(it -> edit.remove(it));
+        edit.commit();
+    }
+
     public void createNotificationChannel() {
 
         CharSequence name = getString(R.string.channel_name);
         String description = getString(R.string.channel_description);
         int importance = NotificationManager.IMPORTANCE_DEFAULT;
         NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance);
         channel.setDescription(description);
+        channel.setSound(null, null);
 
 
         // Register the channel with the system; you can't change the importance

yaacc/src/main/java/de/yaacc/browser/BrowseContentItemAdapter.java

@@ -18,17 +18,15 @@
 package de.yaacc.browser;
 
 import android.content.Context;
-import android.view.View;
-import android.widget.ProgressBar;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.AsyncTask;
-import de.yaacc.util.YaaccLogger;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -40,7 +38,6 @@
 import org.fourthline.cling.support.model.container.Container;
 import org.fourthline.cling.support.model.item.AudioItem;
 import org.fourthline.cling.support.model.item.ImageItem;
-import org.fourthline.cling.support.model.item.Item;
 import org.fourthline.cling.support.model.item.PlaylistItem;
 import org.fourthline.cling.support.model.item.TextItem;
 import org.fourthline.cling.support.model.item.VideoItem;
@@ -56,6 +53,7 @@
 import de.yaacc.Yaacc;
 import de.yaacc.upnp.UpnpClient;
 import de.yaacc.util.ThemeHelper;
+import de.yaacc.util.YaaccLogger;
 import de.yaacc.util.image.IconDownloadTask;
 
 /**
@@ -133,6 +131,7 @@ public void addAll(Collection<? extends DIDLObject> newObjects) {
         YaaccLogger.d(getClass().getName(), "added objects; " + newObjects);
         int start = objects.size();
         List<DIDLObject> filteredObjects = newObjects.stream().filter(it -> !objects.contains(it)).collect(Collectors.toList());
+        YaaccLogger.d(getClass().getName(), "Adding " + filteredObjects.size() + " new objects (filtered from " + newObjects.size() + " total)");
         objects.addAll(filteredObjects);
         notifyItemRangeInserted(start, filteredObjects.size());
     }
@@ -215,6 +214,7 @@ public void onBindViewHolder(final BrowseContentItemAdapter.ViewHolder holder, f
 
         DIDLObject currentObject = (DIDLObject) getItem(listPosition);
         holder.name.setText(currentObject.getTitle());
+
         IconDownloadTask iconDownloadTask = new IconDownloadTask(holder.icon,
                 this);
         asyncTasks.add(iconDownloadTask);

yaacc/src/main/java/de/yaacc/browser/TabBrowserActivity.java

@@ -96,7 +96,6 @@ public class TabBrowserActivity extends AppCompatActivity implements OnClickList
 
 
     private Intent serverService = null;
-    private Toast volumeToast = null;
 
     //https://developer.android.com/about/versions/14/changes/partial-photo-video-access
     private static String[] getPermissions() {
@@ -357,7 +356,6 @@ public void onResume() {
         long start = System.currentTimeMillis();
         super.onResume();
         viewPager.setUserInputEnabled(getPreferences().getBoolean(getString(R.string.settings_swipe_chkbx), true));
-        setVolumeControlStream(-1000); //use an invalid audio stream to block controlling default streams
         boolean serverOn = getPreferences().getBoolean(
                 getString(R.string.settings_local_server_chkbx), false);
         if (serverOn) {
@@ -445,63 +443,9 @@ public void onClick(View view) {
 
     }
 
-    private Toast createVolumeToast(Drawable icon) {
-        LayoutInflater inflater = getLayoutInflater();
-        View layout = inflater.inflate(R.layout.custom_toast, findViewById(R.id.toast_custom));
-        TypedValue typedValue = new TypedValue();
-        getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
-        layout.setBackgroundColor(typedValue.data);
-        ImageView imageView = layout.findViewById(R.id.customToastImageView);
-        imageView.setImageDrawable(icon);
-        TextView text = layout.findViewById(R.id.customToastTextView);
-        text.setText("");
-        Toast toast = new Toast(getApplicationContext());
-        toast.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
-        toast.setDuration(Toast.LENGTH_SHORT);
-        toast.setView(layout);
-        return toast;
-    }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        upnpClient.getReceiverDevices().forEach(d -> {
-            if (upnpClient.hasActionGetVolume(d))
-                switch (keyCode) {
-                    case KeyEvent.KEYCODE_VOLUME_UP:
-                        if (upnpClient.getVolume(d) < 100) {
-                            upnpClient.setVolume(d, upnpClient.getVolume(d) + 1);
-                        }
-                        break;
-                    case KeyEvent.KEYCODE_VOLUME_DOWN:
-                        if (upnpClient.getVolume(d) > 0) {
-                            upnpClient.setVolume(d, upnpClient.getVolume(d) - 1);
-                        }
-                        break;
-                }
-        });
-        if (!upnpClient.getReceiverDevices().isEmpty()) {
-            if (KeyEvent.KEYCODE_VOLUME_UP == keyCode || KeyEvent.KEYCODE_VOLUME_DOWN == keyCode) {
-                Drawable icon = keyCode == KeyEvent.KEYCODE_VOLUME_UP ? ThemeHelper.tintDrawable(getResources().getDrawable(R.drawable.ic_baseline_volume_up_96, getTheme()), getTheme()) : ThemeHelper.tintDrawable(getResources().getDrawable(R.drawable.ic_baseline_volume_down_96, getTheme()), getTheme());
-                if (volumeToast != null) {
-                    volumeToast.cancel();
-                }
-                volumeToast = createVolumeToast(icon);
-                volumeToast.show();
-                if (viewPager != null && tabLayout != null && tabLayout.getSelectedTabPosition() == BrowserTabs.RECEIVER.ordinal() && tabLayout.getTabAt(tabLayout.getSelectedTabPosition()).view != null) {
-                    List<Fragment> fragments = getSupportFragmentManager().getFragments();
-                    if (fragments.size() > viewPager.getCurrentItem()) {
-                        RecyclerView view = fragments.get(viewPager.getCurrentItem()).getView().findViewById(R.id.receiverList);
-                        if (view != null && view.getAdapter() != null) {
-                            view.getAdapter().notifyDataSetChanged();
-                        }
-                    }
-                }
-            }
-        }
-
-
+        // Let system handle volume keys - shows standard Android volume UI
         return super.onKeyDown(keyCode, event);
     }
-
-
 }