diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/build.gradle | 5 | ||||
-rw-r--r-- | app/src/main/AndroidManifest.xml | 10 | ||||
-rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/Constants.java | 8 | ||||
-rw-r--r-- | app/src/main/res/xml/mostrecent_syncadapter.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/playlists_syncadapter.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/podcasts_syncadapter.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/searchable.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/starred_syncadapter.xml | 2 |
8 files changed, 19 insertions, 14 deletions
diff --git a/app/build.gradle b/app/build.gradle index f96f3051..38401e63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,6 +13,11 @@ android { resConfigs "de", "es", "fr", "hu", "nl", "pt-rPT", "ru", "sv" vectorDrawables.useSupportLibrary = true resValue 'string', 'account_type.subsonic', applicationId + ".subsonic" + resValue 'string', 'provider.search', applicationId + ".provider.DSubSearchProvider" + resValue 'string', 'provider.playlist', applicationId + ".playlists.provider" + resValue 'string', 'provider.podcast', applicationId + ".podcasts.provider" + resValue 'string', 'provider.starred', applicationId + ".starred.provider" + resValue 'string', 'provider.recently_added', applicationId + ".mostrecent.provider" } buildTypes { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 52756534..ffefe19e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -214,24 +214,24 @@ </receiver> <provider android:name="github.daneren2005.dsub.provider.DSubSearchProvider" - android:authorities="github.daneren2005.dsub.provider.DSubSearchProvider"/> + android:authorities="@string/provider.search"/> <provider android:name="github.daneren2005.dsub.provider.PlaylistStubProvider" - android:authorities="github.daneren2005.dsub.playlists.provider" + android:authorities="@string/provider.playlist" android:label="@string/button_bar.playlists" android:exported="false" android:syncable="true"/> <provider android:name="github.daneren2005.dsub.provider.PodcastStubProvider" - android:authorities="github.daneren2005.dsub.podcasts.provider" + android:authorities="@string/provider.podcast" android:label="@string/button_bar.podcasts" android:exported="false" android:syncable="true"/> <provider android:name="github.daneren2005.dsub.provider.StarredStubProvider" - android:authorities="github.daneren2005.dsub.starred.provider" + android:authorities="@string/provider.starred" android:label="@string/main.albums_starred" android:exported="false" android:syncable="true"/> <provider android:name="github.daneren2005.dsub.provider.MostRecentStubProvider" - android:authorities="github.daneren2005.dsub.mostrecent.provider" + android:authorities="@string/provider.recently_added" android:label="@string/main.albums_newest" android:exported="false" android:syncable="true"/> diff --git a/app/src/main/java/github/daneren2005/dsub/util/Constants.java b/app/src/main/java/github/daneren2005/dsub/util/Constants.java index e62b93f9..0ce58d73 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Constants.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Constants.java @@ -223,10 +223,10 @@ public final class Constants { // Account prefs public static final String SYNC_ACCOUNT_NAME = "Subsonic Account"; public static final String SYNC_ACCOUNT_TYPE = BuildConfig.APPLICATION_ID + ".subsonic"; - public static final String SYNC_ACCOUNT_PLAYLIST_AUTHORITY = "github.daneren2005.dsub.playlists.provider"; - public static final String SYNC_ACCOUNT_PODCAST_AUTHORITY = "github.daneren2005.dsub.podcasts.provider"; - public static final String SYNC_ACCOUNT_STARRED_AUTHORITY = "github.daneren2005.dsub.starred.provider"; - public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = "github.daneren2005.dsub.mostrecent.provider"; + public static final String SYNC_ACCOUNT_PLAYLIST_AUTHORITY = BuildConfig.APPLICATION_ID + ".playlists.provider"; + public static final String SYNC_ACCOUNT_PODCAST_AUTHORITY = BuildConfig.APPLICATION_ID + ".podcasts.provider"; + public static final String SYNC_ACCOUNT_STARRED_AUTHORITY = BuildConfig.APPLICATION_ID + ".starred.provider"; + public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = BuildConfig.APPLICATION_ID + ".mostrecent.provider"; public static final String TASKER_EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"; diff --git a/app/src/main/res/xml/mostrecent_syncadapter.xml b/app/src/main/res/xml/mostrecent_syncadapter.xml index 8c6dada2..a0172501 100644 --- a/app/src/main/res/xml/mostrecent_syncadapter.xml +++ b/app/src/main/res/xml/mostrecent_syncadapter.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" - android:contentAuthority="github.daneren2005.dsub.mostrecent.provider" + android:contentAuthority="@string/provider.recently_added" android:accountType="@string/account_type.subsonic" android:userVisible="true" android:supportsUploading="false" diff --git a/app/src/main/res/xml/playlists_syncadapter.xml b/app/src/main/res/xml/playlists_syncadapter.xml index 986f11b4..1cea7a2d 100644 --- a/app/src/main/res/xml/playlists_syncadapter.xml +++ b/app/src/main/res/xml/playlists_syncadapter.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" - android:contentAuthority="github.daneren2005.dsub.playlists.provider" + android:contentAuthority="@string/provider.playlist" android:accountType="@string/account_type.subsonic" android:userVisible="true" android:supportsUploading="false" diff --git a/app/src/main/res/xml/podcasts_syncadapter.xml b/app/src/main/res/xml/podcasts_syncadapter.xml index 7a943c32..c992fc96 100644 --- a/app/src/main/res/xml/podcasts_syncadapter.xml +++ b/app/src/main/res/xml/podcasts_syncadapter.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" - android:contentAuthority="github.daneren2005.dsub.podcasts.provider" + android:contentAuthority="@string/provider.podcast" android:accountType="@string/account_type.subsonic" android:userVisible="true" android:supportsUploading="false" diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml index 35ff18f3..5967ae45 100644 --- a/app/src/main/res/xml/searchable.xml +++ b/app/src/main/res/xml/searchable.xml @@ -4,7 +4,7 @@ android:hint="@string/search.title" android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" android:voiceLanguageModel="web_search" - android:searchSuggestAuthority="github.daneren2005.dsub.provider.DSubSearchProvider" + android:searchSuggestAuthority="@string/provider.search" android:searchSuggestSelection=" unused" android:searchSuggestIntentAction="android.intent.action.VIEW"> </searchable>
\ No newline at end of file diff --git a/app/src/main/res/xml/starred_syncadapter.xml b/app/src/main/res/xml/starred_syncadapter.xml index f325da26..1d855057 100644 --- a/app/src/main/res/xml/starred_syncadapter.xml +++ b/app/src/main/res/xml/starred_syncadapter.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" - android:contentAuthority="github.daneren2005.dsub.starred.provider" + android:contentAuthority="@string/provider.starred" android:accountType="@string/account_type.subsonic" android:userVisible="true" android:supportsUploading="false" |