From 86bb65d838bb37f27e8de00b5f7ff3fe30c30782 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 29 Jul 2018 14:50:42 -0700
Subject: Fix #867 Android Auto not showing up as an option from bad Google
 specific AndroidManifest definition

---
 app/src/google/AndroidManifest.xml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml
index 14827d43..0708a47e 100644
--- a/app/src/google/AndroidManifest.xml
+++ b/app/src/google/AndroidManifest.xml
@@ -2,17 +2,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="github.daneren2005.dsub">
 
-    <meta-data
-        android:name="com.google.android.backup.api_key"
-        android:value="AEdPqrEAAAAIUhOMtwa_eG-f0oYUHnetl_Cz7cO9zae8ZXOK5w" />
-    <meta-data
-        android:name="com.google.android.gms.version"
-        android:value="@integer/google_play_services_version" />
-    <meta-data
-        android:name="com.google.android.gms.car.application"
-        android:resource="@xml/auto_app_description" />
-    <meta-data
-        android:name="com.google.android.gms.car.notification.SmallIcon"
-        android:resource="@drawable/stat_notify_playing" />
+    <application android:label="@string/common.appname"
+         android:backupAgent="github.daneren2005.dsub.util.SettingsBackupAgent"
+         android:icon="@drawable/launch"
+         android:theme="@style/Theme.DSub.Light">
+
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAIUhOMtwa_eG-f0oYUHnetl_Cz7cO9zae8ZXOK5w" />
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/auto_app_description" />
+        <meta-data
+            android:name="com.google.android.gms.car.notification.SmallIcon"
+            android:resource="@drawable/stat_notify_playing" />
+    </application>
 
 </manifest>
-- 
cgit v1.2.3


From ec8eda88305cad19f2fe16cf5516f27cd9fb2e50 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 29 Jul 2018 14:31:32 -0700
Subject: Probably fix crashes in DLNARouterProvider from concurrent add/remove
 events

---
 .../dsub/provider/DLNARouteProvider.java           | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java b/app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java
index 0ee16723..f4238c99 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java
+++ b/app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java
@@ -228,7 +228,9 @@ public class DLNARouteProvider extends MediaRouteProvider {
 			removing.remove(id);
 			return;
 		}
-		adding.add(id);
+		synchronized (adding) {
+			adding.add(id);
+		}
 
 		if(device.getType().getType().equals("MediaRenderer") && device instanceof RemoteDevice) {
 			try {
@@ -255,21 +257,35 @@ public class DLNARouteProvider extends MediaRouteProvider {
 								broadcastDescriptors();
 							}
 						});
-						adding.remove(id);
+
+						synchronized (adding) {
+							if (adding.contains(id)) {
+								adding.remove(id);
+							}
+						}
 					}
 
 					@Override
 					public void failure(ActionInvocation actionInvocation, UpnpResponse upnpResponse, String s) {
 						Log.w(TAG, "Failed to get default volume for DLNA route");
 						Log.w(TAG, "Reason: " + s);
-						adding.remove(id);
+
+						synchronized (adding) {
+							if (adding.contains(id)) {
+								adding.remove(id);
+							}
+						}
 					}
 				});
 			} catch(Exception e) {
 				Log.e(TAG, "Failed to add device", e);
 			}
 		} else {
-			adding.remove(id);
+			synchronized (adding) {
+				if(adding.contains(id)) {
+					adding.remove(id);
+				}
+			}
 		}
 	}
 	private void deviceRemoved(Device device) {
-- 
cgit v1.2.3


From 16f0d95d9a5a2cde9998535322174e96fb96fb3e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 29 Jul 2018 14:58:22 -0700
Subject: DSub 5.4.1 released

---
 app/build.gradle                   | 4 ++--
 app/src/main/res/xml/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 34743802..339853e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
 		applicationId "github.daneren2005.dsub"
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 197
-		versionName '5.4'
+		versionCode 198
+		versionName '5.4.1'
 		setProperty("archivesBaseName", "DSub $versionName")
 		resConfigs "de", "es", "fr", "hu", "nl", "pt-rPT", "ru", "sv"
 	}
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index ec9c4ea4..8aa15153 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="5.4.1" versioncode="198" releasedate="07/29/2018">
+		<change>Fix Android Auto compatibility</change>
+	</release>
 	<release version="5.4" versioncode="197" releasedate="07/26/2018">
 		<change>Add option to change rewind/fast forward interval (thanks KBerstene)</change>
 		<change>Auto: Play entire directory when selecting song (thanks hufman)</change>
-- 
cgit v1.2.3