Renamed SearchSuggestionProvider1 to DsubSearchProvider

6 files changed, 14 insertions, 14 deletions

diff --git a/subsonic-android/AndroidManifest.xml b/subsonic-android/AndroidManifest.xml
index 46746378..aeadefa9 100644
--- a/subsonic-android/AndroidManifest.xml
+++ b/subsonic-android/AndroidManifest.xml
@@ -109,8 +109,8 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info"/>

         </receiver>

 

-        <provider android:name="github.daneren2005.dsub.provider.SearchSuggestionProvider1"

-                  android:authorities="github.daneren2005.dsub.provider.SearchSuggestionProvider1"/>

+        <provider android:name="github.daneren2005.dsub.provider.DSubSearchProvider"

+                  android:authorities="github.daneren2005.dsub.provider.DSubSearchProvider"/>

 

         <meta-data android:name="android.app.default_searchable"

                    android:value="github.daneren2005.dsub.activity.QueryReceiverActivity"/>

diff --git a/subsonic-android/res/xml/searchable.xml b/subsonic-android/res/xml/searchable.xml
index 80276434..a3713aa3 100644
--- a/subsonic-android/res/xml/searchable.xml
+++ b/subsonic-android/res/xml/searchable.xml
@@ -4,6 +4,6 @@
             android:hint="@string/search.title"
             android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             android:voiceLanguageModel="web_search"
-            android:searchSuggestAuthority="github.daneren2005.dsub.provider.SearchSuggestionProvider1"
+            android:searchSuggestAuthority="github.daneren2005.dsub.provider.DSubSearchProvider"
             android:searchSuggestSelection=" ?" >
 </searchable>
\ No newline at end of file
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/QueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/QueryReceiverActivity.java
index fcce2de9..15d0c6a6 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/QueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/QueryReceiverActivity.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.provider.SearchSuggestionProvider1;
+import github.daneren2005.dsub.provider.DSubSearchProvider;
 
 /**
  * Receives search queries and forwards to the SelectAlbumActivity.
@@ -42,8 +42,8 @@ public class QueryReceiverActivity extends Activity {
         String query = getIntent().getStringExtra(SearchManager.QUERY);
 
         if (query != null) {
-            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, SearchSuggestionProvider1.AUTHORITY,
-                                                                              SearchSuggestionProvider1.MODE);
+            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, DSubSearchProvider.AUTHORITY,
+                                                                              DSubSearchProvider.MODE);
             suggestions.saveRecentQuery(query, null);
 
             Intent intent = new Intent(QueryReceiverActivity.this, SearchActivity.class);
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 82b3cc05..086b48ca 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -28,7 +28,7 @@ import android.preference.PreferenceScreen;
 import android.provider.SearchRecentSuggestions;
 import android.util.Log;
 import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.provider.SearchSuggestionProvider1;
+import github.daneren2005.dsub.provider.DSubSearchProvider;
 import github.daneren2005.dsub.service.DownloadService;
 import github.daneren2005.dsub.service.DownloadServiceImpl;
 import github.daneren2005.dsub.service.MusicService;
@@ -103,7 +103,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
         findPreference("clearSearchHistory").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                SearchRecentSuggestions suggestions = new SearchRecentSuggestions(SettingsActivity.this, SearchSuggestionProvider1.AUTHORITY, SearchSuggestionProvider1.MODE);
+                SearchRecentSuggestions suggestions = new SearchRecentSuggestions(SettingsActivity.this, DSubSearchProvider.AUTHORITY, DSubSearchProvider.MODE);
                 suggestions.clearHistory();
                 Util.toast(SettingsActivity.this, R.string.settings_search_history_cleared);
                 return false;
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
index dba6793b..5cda9ee5 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
@@ -26,7 +26,7 @@ import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.provider.SearchSuggestionProvider1;
+import github.daneren2005.dsub.provider.DSubSearchProvider;
 
 /**
  * Receives voice search queries and forwards to the SearchActivity.
@@ -44,8 +44,8 @@ public class VoiceQueryReceiverActivity extends Activity {
         String query = getIntent().getStringExtra(SearchManager.QUERY);
 
         if (query != null) {
-            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, SearchSuggestionProvider1.AUTHORITY,
-                                                                              SearchSuggestionProvider1.MODE);
+            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, DSubSearchProvider.AUTHORITY,
+                                                                              DSubSearchProvider.MODE);
             suggestions.saveRecentQuery(query, null);
 
             Intent intent = new Intent(VoiceQueryReceiverActivity.this, SearchActivity.class);
diff --git a/subsonic-android/src/github/daneren2005/dsub/provider/SearchSuggestionProvider1.java b/subsonic-android/src/github/daneren2005/dsub/provider/DSubSearchProvider.java
index 87560e96..5ddec0f4 100644
--- a/subsonic-android/src/github/daneren2005/dsub/provider/SearchSuggestionProvider1.java
+++ b/subsonic-android/src/github/daneren2005/dsub/provider/DSubSearchProvider.java
@@ -25,12 +25,12 @@ import android.content.SearchRecentSuggestionsProvider;
  *
  * @author Sindre Mehus
  */
-public class SearchSuggestionProvider1 extends SearchRecentSuggestionsProvider {
+public class DSubSearchProvider extends SearchRecentSuggestionsProvider {
 
-    public static final String AUTHORITY = SearchSuggestionProvider1.class.getName();
+    public static final String AUTHORITY = DSubSearchProvider.class.getName();
     public static final int MODE = DATABASE_MODE_QUERIES;
 
-    public SearchSuggestionProvider1() {
+    public DSubSearchProvider() {
         setupSuggestions(AUTHORITY, MODE);
     }
 }
\ No newline at end of file