From 54d47f4101ab2a6b8a6096fba773853b4bc0f4f9 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 3 Mar 2017 15:09:38 -0800
Subject: [PATCH] Fix conflict with subsonic.org account type on Android

---
 app/src/main/java/net/nullsum/audinaut/util/Constants.java | 2 +-
 app/src/main/res/xml/authenticator.xml                     | 4 ++--
 app/src/main/res/xml/playlists_syncadapter.xml             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/nullsum/audinaut/util/Constants.java b/app/src/main/java/net/nullsum/audinaut/util/Constants.java
index bde3f47..5a40eb4 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/Constants.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/Constants.java
@@ -167,7 +167,7 @@ public final class Constants {
 
 	// Account prefs
 	public static final String SYNC_ACCOUNT_NAME = "Subsonic Account";
-	public static final String SYNC_ACCOUNT_TYPE = "subsonic.org";
+	public static final String SYNC_ACCOUNT_TYPE = "Audinaut";
 	public static final String SYNC_ACCOUNT_PLAYLIST_AUTHORITY = "net.nullsum.audinaut.playlists.provider";
 	public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = "net.nullsum.audinaut.mostrecent.provider";
 
diff --git a/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml
index 3055240..c6c39a7 100644
--- a/app/src/main/res/xml/authenticator.xml
+++ b/app/src/main/res/xml/authenticator.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:accountType="subsonic.org"
+	android:accountType="Audinaut"
 	android:icon="@drawable/launch"
 	android:smallIcon="@drawable/launch"
-	android:label="@string/common.appname"/>
\ No newline at end of file
+	android:label="@string/common.appname"/>
diff --git a/app/src/main/res/xml/playlists_syncadapter.xml b/app/src/main/res/xml/playlists_syncadapter.xml
index ad9bdeb..428b710 100644
--- a/app/src/main/res/xml/playlists_syncadapter.xml
+++ b/app/src/main/res/xml/playlists_syncadapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
 	android:contentAuthority="net.nullsum.audinaut.playlists.provider"
-	android:accountType="subsonic.org"
+	android:accountType="Audinaut"
 	android:userVisible="true"
 	android:supportsUploading="false"
 	android:allowParallelSyncs="false"
-	android:isAlwaysSyncable="true"/>
\ No newline at end of file
+	android:isAlwaysSyncable="true"/>