Multiple changes as per the commits. (#1174)

* Refining the lRecyclerView in adapter for the null view * Commented out Preference.OnPreferenceClickListener as deprecated Deprecated in API Level 29 & onward: https://developer.android.com/reference/android/preference/Preference.OnPreferenceClickListener Line 157-166 * Using Local Index as a fall back for stations Sort + fall back to local. * Recording status Invoke progress dialogue box for recording, and a alert dismissal state. * Corrected the log option changed in error Earlier had changed Log.d to Log.e in error. Corrected the same. * Lenient in query length * Create ic_expand_more_white_24dp.xml More White * View changes Changes to the view. * Extra space removed * Corrected layout code app:autoSizeMaxTextSize > android:autoSizeMaxTextSize app:autoSizeMinTextSize > android:autoSizeMinTextSize app:autoSizeTextType > android:autoSizeTextType * Countries/Regions * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support * Fix media browser service and enable android auto support Fix media browser service and enable android auto support
segler-alex · Oct 8, 2023 · 05a7534 · 05a7534
1 parent ee79c56
commit 05a7534
Show file tree

Hide file tree

Showing 22 changed files with 190 additions and 72 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -61,11 +61,10 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
-            <!-- Use this intent filter to get voice searches, like "Play The Beatles" -->
-            <!--<intent-filter>-->
-                <!--<action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />-->
-                <!--<category android:name="android.intent.category.DEFAULT" />-->
-            <!--</intent-filter>-->
+            <intent-filter>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
         <service
             android:name="net.programmierecke.radiodroid2.service.PlayerService"
@@ -77,14 +76,14 @@
             </intent-filter>
         </service>
 
-<!--        <service-->
-<!--            android:name="net.programmierecke.radiodroid2.service.RadioDroidBrowserService"-->
-<!--            android:exported="true"-->
-<!--            tools:ignore="ExportedService">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.media.browse.MediaBrowserService" />-->
-<!--            </intent-filter>-->
-<!--        </service>-->
+<!--        <service
+<!--            android:name="net.programmierecke.radiodroid2.service.RadioDroidBrowserService"
+<!--            android:exported="true"
+<!--            tools:ignore="ExportedService">
+<!--            <intent-filter>
+<!--                <action android:name="android.media.browse.MediaBrowserService" />
+<!--            </intent-filter>
+<!--        </service>
 
         <receiver
             android:name="net.programmierecke.radiodroid2.alarm.AlarmReceiver"
@@ -113,13 +112,13 @@
             </intent-filter>
         </receiver>
 
-        <!--<meta-data-->
-            <!--android:name="com.google.android.gms.car.application"-->
-            <!--android:resource="@xml/automotive_app_desc" />-->
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
 
-        <!--<meta-data-->
-            <!--android:name="com.google.android.gms.car.notification.SmallIcon"-->
-            <!--android:resource="@mipmap/ic_launcher" />-->
+        <meta-data
+            android:name="com.google.android.gms.car.notification.SmallIcon"
+            android:resource="@mipmap/ic_launcher" />
 
     </application>
 </manifest>
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/FallbackStationsManager.kt b/app/src/main/java/net/programmierecke/radiodroid2/FallbackStationsManager.kt
@@ -0,0 +1,16 @@
+package net.programmierecke.radiodroid2
+
+import android.content.Context
+import net.programmierecke.radiodroid2.station.DataRadioStation
+
+class FallbackStationsManager(ctx: Context?) : StationSaveManager(ctx) {
+    override fun Load() {
+        listStations.clear()
+        val str = context.resources
+                .openRawResource(R.raw.fallback_stations)
+                .bufferedReader()
+                .use { it.readText() }
+        val arr = DataRadioStation.DecodeJson(str)
+        listStations.addAll(arr)
+    }
+}
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/FragmentHistory.java b/app/src/main/java/net/programmierecke/radiodroid2/FragmentHistory.java
@@ -55,7 +55,8 @@ public void RefreshListGui() {
 
         if (BuildConfig.DEBUG) Log.d(TAG, "stations count:" + historyManager.listStations.size());
 
-        adapter.updateList(null, historyManager.listStations);
+        if( adapter != null )
+            adapter.updateList(null, historyManager.listStations);
     }
 
     @Override
@@ -214,4 +215,4 @@ public void onDestroyView() {
         super.onDestroyView();
         rvStations.setAdapter(null);
     }
-}
+}
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/FragmentSettings.java b/app/src/main/java/net/programmierecke/radiodroid2/FragmentSettings.java
@@ -154,16 +154,16 @@ public boolean onPreferenceClick(Preference preference) {
                 }
             });
 
-            findPreference("show_about").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    ((ActivityMain) getActivity()).getToolbar().setTitle(R.string.settings_about);
-                    FragmentAbout f = new FragmentAbout();
-                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                    fragmentTransaction.replace(R.id.containerView, f).addToBackStack(String.valueOf(FRAGMENT_FROM_BACKSTACK)).commit();
-                    return false;
-                }
-            });
+//            findPreference("show_about").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+//                @Override
+//                public boolean onPreferenceClick(Preference preference) {
+//                    ((ActivityMain) getActivity()).getToolbar().setTitle(R.string.settings_about);
+//                    FragmentAbout f = new FragmentAbout();
+//                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+//                    fragmentTransaction.replace(R.id.containerView, f).addToBackStack(String.valueOf(FRAGMENT_FROM_BACKSTACK)).commit();
+//                    return false;
+//                }
+//            });
         }
 
         Preference batPref = getPreferenceScreen().findPreference(getString(R.string.key_ignore_battery_optimization));

diff --git a/app/src/main/java/net/programmierecke/radiodroid2/FragmentTabs.java b/app/src/main/java/net/programmierecke/radiodroid2/FragmentTabs.java
@@ -130,6 +130,7 @@ private String getCountryCode() {
                 return countryCode;
             }
             countryCode = ctx.getResources().getConfiguration().locale.getCountry();
+            addresses[IDX_LOCAL] = "json/stations/bycountrycodeexact/?order=clickcount&reverse=true";
             Log.d("MAIN", "Locale: '" + countryCode + "'");
             if (countryCode != null && countryCode.length() == 2) {
                 return countryCode;

diff --git a/app/src/main/java/net/programmierecke/radiodroid2/RadioDroidApp.java b/app/src/main/java/net/programmierecke/radiodroid2/RadioDroidApp.java
@@ -37,6 +37,7 @@ public class RadioDroidApp extends MultiDexApplication {
     private HistoryManager historyManager;
     private FavouriteManager favouriteManager;
     private RecordingsManager recordingsManager;
+    private FallbackStationsManager fallbackStationsManager;
     private RadioAlarmManager alarmManager;
     private TvChannelManager tvChannelManager;
 
@@ -95,6 +96,7 @@ public void onCreate() {
 
         historyManager = new HistoryManager(this);
         favouriteManager = new FavouriteManager(this);
+        fallbackStationsManager = new FallbackStationsManager(this);
         recordingsManager = new RecordingsManager();
         alarmManager = new RadioAlarmManager(this);
 
@@ -129,6 +131,10 @@ public void rebuildHttpClient() {
         httpClient = builder.build();
     }
 
+    public FallbackStationsManager getFallbackStationsManager() {
+        return fallbackStationsManager;
+    }
+
     public HistoryManager getHistoryManager() {
         return historyManager;
     }

diff --git a/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java b/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java
@@ -13,6 +13,7 @@
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.collection.ArraySet;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import net.programmierecke.radiodroid2.station.DataRadioStation;
@@ -59,6 +60,8 @@ protected void setStationStatusListener(StationStatusListener stationStatusListe
     }
 
     public void add(DataRadioStation station) {
+        if (station.queue == null)
+            station.queue = this;
         listStations.add(station);
         Save();
 
@@ -93,6 +96,8 @@ public void replaceList(List<DataRadioStation> stations_new) {
     }
 
     public void addFront(DataRadioStation station) {
+        if (station.queue == null)
+            station.queue = this;
         listStations.add(0, station);
         Save();
 
@@ -103,6 +108,15 @@ public void addFront(DataRadioStation station) {
         }
     }
 
+        public void addAll(List<DataRadioStation> stations) {
+        if (stations == null)
+            return;
+        for (DataRadioStation station : stations) {
+            station.queue = this;
+        }
+        listStations.addAll(stations);
+    }
+
     public DataRadioStation getLast() {
         if (!listStations.isEmpty()) {
             return listStations.get(listStations.size() - 1);
@@ -199,6 +213,7 @@ public int remove(String id) {
     }
 
     public void restore(DataRadioStation station, int pos) {
+        station.queue = this;
         listStations.add(pos, station);
         Save();
 
@@ -301,6 +316,9 @@ void Load() {
         String str = sharedPref.getString(getSaveId(), null);
         if (str != null) {
             List<DataRadioStation> arr = DataRadioStation.DecodeJson(str);
+            for (DataRadioStation station : arr) {
+                station.queue = this;
+            }
             listStations.addAll(arr);
             if (hasInvalidUuids() && Utils.hasAnyConnection(context)) {
                 refreshStationsFromServer();
@@ -496,6 +514,7 @@ public boolean SaveM3UWriter(Writer bw) {
     List<DataRadioStation> LoadM3UInternal(String filePath, String fileName) {
         try {
             File f = new File(filePath, fileName);
+            ArraySet<DataRadioStation> loadedItems = null;
             FileReader fr = new FileReader(f);
             return LoadM3UReader(fr);
         } catch (Exception e) {
@@ -518,7 +537,11 @@ List<DataRadioStation> LoadM3UReader(Reader reader) {
                 if (line.startsWith(M3U_PREFIX)) {
                     try {
                         String uuid = line.substring(M3U_PREFIX.length()).trim();
-                        listUuids.add(uuid);
+                        DataRadioStation station = Utils.getStationByUuid(httpClient, context, uuid);
+                        if (station != null) {
+                            station.queue = this;
+                            loadedItems.add(station);
+                        }
                     } catch (Exception e) {
                         Log.e("LOAD", e.toString());
                     }

diff --git a/app/src/main/java/net/programmierecke/radiodroid2/recording/RecordingsAdapter.java b/app/src/main/java/net/programmierecke/radiodroid2/recording/RecordingsAdapter.java
@@ -95,6 +95,7 @@ public int getItemCount() {
     }
 
     void openRecording(DataRecording theData) {
+        ProgressDialog dialog = ProgressDialog.show(context, "Loading...", "Please wait...", true, false);
         String path = RecordingsManager.getRecordDir() + "/" + theData.Name;
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "play: " + path);
@@ -121,9 +122,11 @@ void openRecording(DataRecording theData) {
                 String packageName = resolveInfo.activityInfo.packageName;
                 context.grantUriPermission(packageName, fileUri,
                         Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                dialog.dismiss();
             }
         }
 
         context.startActivity(i);
+        dialog.dismiss();
     }
 }
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/service/MediaSessionCallback.java b/app/src/main/java/net/programmierecke/radiodroid2/service/MediaSessionCallback.java
@@ -110,12 +110,15 @@ public void onPlayFromMediaId(String mediaId, Bundle extras) {
 
     @Override
     public void onPlayFromSearch(String query, Bundle extras) {
+        // remove voice search residues like " with radiodroid"
+        query = query.replaceAll("(?i) \\w+ radio\\s*droid.*", "");
+
         DataRadioStation station = ((RadioDroidApp) context.getApplicationContext()).getFavouriteManager().getBestNameMatch(query);
         if (station == null)
            station = ((RadioDroidApp) context.getApplicationContext()).getHistoryManager().getBestNameMatch(query);
-        if (station != null) {
-            GetRealLinkAndPlayTask playTask = new GetRealLinkAndPlayTask(context, station, playerService);
-            playTask.execute();
-        }
+        if (station == null)
+            station = ((RadioDroidApp) context.getApplicationContext()).getFallbackStationsManager().getBestNameMatch(query);
+        GetRealLinkAndPlayTask playTask = new GetRealLinkAndPlayTask(context, station, playerService);
+        playTask.execute();
     }
-}
+}
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/service/PlayerService.java b/app/src/main/java/net/programmierecke/radiodroid2/service/PlayerService.java
@@ -465,7 +465,7 @@ public void onCreate() {
         Intent startActivityIntent = new Intent(itsContext.getApplicationContext(), ActivityMain.class);
         mediaSession.setSessionActivity(PendingIntent.getActivity(itsContext.getApplicationContext(), 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT | pendingIntentFlag));
 
-        mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
+        setMediaPlaybackState(PlaybackStateCompat.STATE_NONE);
 
         RadioDroidApp radioDroidApp = (RadioDroidApp) getApplication();
         trackHistoryRepository = radioDroidApp.getTrackHistoryRepository();
@@ -660,8 +660,8 @@ public void next() {
             return;
         }
 
-        RadioDroidApp radioDroidApp = (RadioDroidApp) getApplication();
-        DataRadioStation station = radioDroidApp.getFavouriteManager().getNextById(currentStation.StationUuid);
+        setMediaPlaybackState(PlaybackStateCompat.STATE_SKIPPING_TO_NEXT);
+        DataRadioStation station = currentStation.queue.getNextById(currentStation.StationUuid);
 
         if (station != null) {
             if (radioPlayer.isPlaying()) {
@@ -679,8 +679,7 @@ public void previous() {
             return;
         }
 
-        RadioDroidApp radioDroidApp = (RadioDroidApp) getApplication();
-        DataRadioStation station = radioDroidApp.getFavouriteManager().getPreviousById(currentStation.StationUuid);
+        DataRadioStation station = currentStation.queue.getPreviousById(currentStation.StationUuid);
         if (station != null) {
             if (radioPlayer.isPlaying()) {
                 playWithoutWarnings(station);
@@ -794,19 +793,22 @@ private void setMediaPlaybackState(int state) {
             playbackStateBuilder.setErrorMessage(PlaybackStateCompat.ERROR_CODE_ACTION_ABORTED, error);
         }
 
-        playbackStateBuilder.setState(state, PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN, 0);
+        playbackStateBuilder.setState(state, PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN, 1.0f);
         mediaSession.setPlaybackState(playbackStateBuilder.build());
     }
 
     private void enableMediaSession() {
-        if (BuildConfig.DEBUG) Log.d(TAG, "enabling media session.");
+        if (!mediaSession.isActive()) {
+            if (BuildConfig.DEBUG) Log.d(TAG, "enabling media session.");
 
-        IntentFilter becomingNoisyFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
-        registerReceiver(becomingNoisyReceiver, becomingNoisyFilter);
+            IntentFilter becomingNoisyFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+            registerReceiver(becomingNoisyReceiver, becomingNoisyFilter);
 
-        mediaSession.setActive(true);
+            mediaSession.setActive(true);
 
         setMediaPlaybackState(PlaybackStateCompat.STATE_NONE);
+            setMediaPlaybackState(PlaybackStateCompat.STATE_NONE);
+        }
     }
 
     private void disableMediaSession() {
@@ -1007,6 +1009,7 @@ private void updateNotification(PlayState playState) {
 
                 if (mediaSession != null) {
                     final MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
+                    builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, -1);
                     builder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, currentStation.Name);
                     builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, liveInfo.getArtist());
                     builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, liveInfo.getTrack());