Funkwhale/Audinaut-subsonic-app-android
1
0
Fork 0
mirror of https://github.com/nvllsvm/Audinaut synced 2025-02-19 21:10:35 +01:00
Code Issues Releases Wiki Activity

Merge pull request #5 from craftyguy/fix_account_type

Browse Source 
Fix conflict with subsonic.org account type on Android
This commit is contained in:
Andrew Rabert 2017-03-04 09:43:46 -05:00 committed by GitHub
commit 39a457d1ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/nullsum/audinaut/util/Constants.java
View File

@ -167,7 +167,7 @@ public final class Constants {
// Account prefs // Account prefs
public static final String SYNC_ACCOUNT_NAME = "Subsonic Account"; 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_PLAYLIST_AUTHORITY = "net.nullsum.audinaut.playlists.provider";
public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = "net.nullsum.audinaut.mostrecent.provider"; public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = "net.nullsum.audinaut.mostrecent.provider";

2
app/src/main/res/xml/authenticator.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<account-authenticator <account-authenticator
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="subsonic.org" android:accountType="Audinaut"
android:icon="@drawable/launch" android:icon="@drawable/launch"
android:smallIcon="@drawable/launch" android:smallIcon="@drawable/launch"
android:label="@string/common.appname"/> android:label="@string/common.appname"/>

2
app/src/main/res/xml/playlists_syncadapter.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="net.nullsum.audinaut.playlists.provider" android:contentAuthority="net.nullsum.audinaut.playlists.provider"
android:accountType="subsonic.org" android:accountType="Audinaut"
android:userVisible="true" android:userVisible="true"
android:supportsUploading="false" android:supportsUploading="false"
android:allowParallelSyncs="false" android:allowParallelSyncs="false"