Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Increment version to 1.2.0.4

This commit is contained in:
Joshua Bahnsen 2013-06-07 12:22:35 -07:00
parent 20b99b0ce9
commit 8c71bcf1f3
6 changed files with 239 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -3,7 +3,7 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.2.2" project-jdk-type="Android SDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android SDK" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

387
.idea/workspace.xml
View File

@ -23,7 +23,17 @@
</layouts>
</component>
<component name="ChangeListManager">
<list default="true" id="c6045714-7712-49eb-b3d0-21a5501c58a7" name="Default" comment="" />
<list default="true" id="c6045714-7712-49eb-b3d0-21a5501c58a7" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/AndroidManifest.xml" afterPath="$PROJECT_DIR$/AndroidManifest.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/BuildConfig.java" afterPath="$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/BuildConfig.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java" afterPath="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/Manifest.java" afterPath="$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/Manifest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/R.java" afterPath="$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/R.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java" afterPath="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java" afterPath="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="Subsonic-Android.iws" />
<ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" />
@ -86,39 +96,28 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="DownloadServiceImpl.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java">
<file leaf-file-name="DownloadServiceLifecycleSupport.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java">
<provider selected="true" editor-type-id="text-editor">
<state line="75" column="13" selection-start="3243" selection-end="3243" vertical-scroll-proportion="-5.04" vertical-offset="27" max-vertical-offset="27523">
<state line="46" column="13" selection-start="1662" selection-end="1662" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4065">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MainActivity.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java">
<file leaf-file-name="MediaStoreService.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="24" selection-start="2609" selection-end="2609" vertical-scroll-proportion="0.0" vertical-offset="515" max-vertical-offset="6953">
<folding>
<element signature="e#16405#16458#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="proguard.cfg" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/proguard.cfg">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="0" selection-start="98" selection-end="98" vertical-scroll-proportion="0.16873449" vertical-offset="0" max-vertical-offset="799">
<state line="35" column="13" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1425">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DownloadFile.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java">
<file leaf-file-name="MusicService.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="196" column="20" selection-start="5677" selection-end="5677" vertical-scroll-proportion="0.0" vertical-offset="2603" max-vertical-offset="6154">
<state line="46" column="17" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1605">
<folding />
</state>
</provider>
@ -127,61 +126,64 @@
<file leaf-file-name="Util.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state line="430" column="23" selection-start="18351" selection-end="18351" vertical-scroll-proportion="0.0" vertical-offset="5844" max-vertical-offset="21301">
<state line="1046" column="52" selection-start="40578" selection-end="40578" vertical-scroll-proportion="0.0" vertical-offset="14214" max-vertical-offset="18750">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CancellableTask.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java">
<file leaf-file-name="MusicServiceFactory.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java">
<provider selected="true" editor-type-id="text-editor">
<state line="81" column="0" selection-start="2551" selection-end="2551" vertical-scroll-proportion="0.0" vertical-offset="802" max-vertical-offset="1173">
<state line="27" column="13" selection-start="887" selection-end="887" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UltraSonicAppWidgetProvider4x2.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java">
<file leaf-file-name="OfflineException.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="0" selection-start="1210" selection-end="1210" vertical-scroll-proportion="0.0" vertical-offset="88" max-vertical-offset="459">
<state line="26" column="13" selection-start="872" selection-end="872" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubsonicTabActivity.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java">
<file leaf-file-name="OfflineMusicService.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="621" column="39" selection-start="21794" selection-end="21794" vertical-scroll-proportion="-3.72" vertical-offset="8509" max-vertical-offset="15844">
<state line="56" column="13" selection-start="2124" selection-end="2124" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7980">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RESTMusicService.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="736" column="22" selection-start="30652" selection-end="30652" vertical-scroll-proportion="0.3592535" vertical-offset="9189" max-vertical-offset="17910">
<folding>
<element signature="e#21518#23016#0" expanded="true" />
<element signature="e#23005#23006#0" expanded="true" />
<element signature="e#44654#44757#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DownloadActivity.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java">
<file leaf-file-name="AndroidManifest.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="104" column="20" selection-start="4171" selection-end="4171" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="17663">
<state line="103" column="38" selection-start="4084" selection-end="4084" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3030">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SelectAlbumActivity.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java">
<file leaf-file-name="Manifest.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/Manifest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="139" column="0" selection-start="6048" selection-end="6048" vertical-scroll-proportion="0.0" vertical-offset="1203" max-vertical-offset="12852">
<folding>
<element signature="e#6099#6100#0" expanded="true" />
<element signature="e#11824#11846#0" expanded="true" />
<element signature="e#34333#34390#0" expanded="true" />
<element signature="e#34762#34819#0" expanded="true" />
</folding>
<state line="5" column="19" selection-start="193" selection-end="193" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
<folding />
</state>
</provider>
</entry>
@ -194,14 +196,22 @@
</FindUsagesManager>
</component>
<component name="GenerateSignedApkSettings">
<option name="KEY_STORE_PATH" value="C:\Users\Josh\Documents\AndroidKey\sign.key" />
<option name="KEY_STORE_PATH" value="D:\AndroidKey\sign.key" />
<option name="KEY_ALIAS" value="archrival" />
<option name="REMEMBER_PASSWORDS" value="true" />
</component>
<component name="Git.Settings">
<option name="PREVIOUS_COMMIT_AUTHORS">
<list>
<option value="Joshua Bahnsen &lt;archrival@g..." />
<option value="Joshua Bahnsen &lt;archrival@gmail.com&gt;" />
<option value="Joshua Bahnsen" />
</list>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitLogSettings">
<option name="myStructureFilterPaths" />
<option name="myDateState">
<MyDateState />
</option>
@ -209,30 +219,30 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java" />
<option value="$PROJECT_DIR$/Android-PullToRefresh/library/src/com/handmark/pulltorefresh/library/internal/LoadingLayout.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java" />
<option value="$PROJECT_DIR$/proguard.cfg" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java" />
<option value="$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java" />
<option value="$PROJECT_DIR$/AndroidManifest.xml" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1296" />
<option name="height" value="816" />
<option name="width" value="1616" />
<option name="height" value="1176" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@ -260,6 +270,8 @@
<sortByType />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -318,38 +330,52 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="activity" />
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="project.structure.last.edited" value="Modules" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="211" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="211" />
<property name="project.structure.proportion" value="0.0" />
<property name="AndroidIncludeSystemProguardFile" value="true" />
<property name="options.splitter.main.proportions" value="0.3" />
<property name="AndroidProguardConfigPath" value="C:\Users\Josh\Documents\GitHub\Subsonic-Android\proguard.cfg" />
<property name="ExportedApkPath" value="C:\Users\Josh\Desktop\Subsonic-Android.apk" />
<property name="MemberChooser.sorted" value="false" />
<property name="options.lastSelected" value="editor.preferences.appearance" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="216" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
<property name="recentsLimit" value="5" />
<property name="MemberChooser.sorted" value="false" />
<property name="ExportedApkPath" value="C:\Users\Josh\Desktop\Subsonic-Android.apk" />
<property name="ExportedModule" value="Subsonic-Android" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../AndroidKey/sign.key" />
<property name="project.structure.side.proportion" value="0.0" />
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="dna:5555" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="last_opened_file_path" value="D:/AndroidKey/sign.key" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="212" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="891" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="890" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="212" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="205" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="AndroidRunProguardForReleaseBuild" value="true" />
<property name="restartRequiresConfirmation" value="true" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
<property name="MemberChooser.showClasses" value="true" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="AndroidIncludeSystemProguardFile" value="true" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="AndroidProguardConfigPath" value="C:\Users\Josh\Documents\GitHub\Subsonic-Android\proguard.cfg" />
<property name="options.lastSelected" value="reference.settingsdialog.IDE.editor.colors.Font" />
<property name="project.structure.side.proportion" value="0.0" />
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="dna:5555" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="AndroidRunProguardForReleaseBuild" value="true" />
<property name="restartRequiresConfirmation" value="true" />
<property name="options.searchVisible" value="true" />
</component>
<component name="RunManager" selected="Android Application.Subsonic-Android">
@ -506,38 +532,43 @@
<created>1370584979416</created>
<updated>1370584979416</updated>
</task>
<task id="LOCAL-00001" summary="Android Studio test">
<created>1370596209522</created>
<updated>1370596209522</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1296" height="816" extended-state="6" />
<editor active="true" />
<frame x="-8" y="-8" width="1616" height="1176" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298217" sideWeight="0.6009105" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32776934" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33064517" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37784523" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32776934" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.122119814" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32874015" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2785433" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24797407" sideWeight="0.6707132" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3298217" sideWeight="0.6707132" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32928678" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24230146" sideWeight="0.6707132" order="0" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39908952" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32928678" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25289574" sideWeight="0.6712598" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298217" sideWeight="0.6009105" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32776934" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3298217" sideWeight="0.6707132" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32928678" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39908952" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
@ -582,7 +613,7 @@
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
<option name="LAST_COMMIT_MESSAGE" />
<option name="LAST_COMMIT_MESSAGE" value="Increment version to 1.2.0.4" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@ -596,133 +627,127 @@
<option name="UPDATE_FILTER_BY_SCOPE" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Android Studio test" />
<MESSAGE value="Increment version to 1.2.0.4" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java">
<provider selected="true" editor-type-id="text-editor">
<state line="348" column="0" selection-start="11090" selection-end="11090" vertical-scroll-proportion="0.0" vertical-offset="4701" max-vertical-offset="5321">
<state line="54" column="40" selection-start="2230" selection-end="2230" vertical-scroll-proportion="0.0" vertical-offset="585" max-vertical-offset="1425">
<folding />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/os/Looper.class">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="16" selection-start="712" selection-end="712" vertical-scroll-proportion="0.4075067" vertical-offset="222" max-vertical-offset="595">
<state line="47" column="13" selection-start="1670" selection-end="1670" vertical-scroll-proportion="0.0" vertical-offset="1575" max-vertical-offset="2700">
<folding />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/os/Handler.class">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="16" selection-start="564" selection-end="564" vertical-scroll-proportion="0.3324397" vertical-offset="148" max-vertical-offset="1411">
<folding />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/view/View.class">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="19482">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state line="104" column="20" selection-start="4171" selection-end="4171" vertical-scroll-proportion="0.0" vertical-offset="544" max-vertical-offset="17663">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="34" column="9" selection-start="1196" selection-end="1196" vertical-scroll-proportion="0.33153638" vertical-offset="64" max-vertical-offset="2057">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state line="621" column="39" selection-start="21794" selection-end="21794" vertical-scroll-proportion="-3.72" vertical-offset="8509" max-vertical-offset="15844">
<folding>
<element signature="e#21518#23016#0" expanded="true" />
<element signature="e#23005#23006#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state line="139" column="0" selection-start="6048" selection-end="6048" vertical-scroll-proportion="0.0" vertical-offset="1203" max-vertical-offset="12852">
<folding>
<element signature="e#6099#6100#0" expanded="true" />
<element signature="e#11824#11846#0" expanded="true" />
<element signature="e#34333#34390#0" expanded="true" />
<element signature="e#34762#34819#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="0" selection-start="1210" selection-end="1210" vertical-scroll-proportion="0.0" vertical-offset="88" max-vertical-offset="459">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java">
<provider selected="true" editor-type-id="text-editor">
<state line="81" column="0" selection-start="2551" selection-end="2551" vertical-scroll-proportion="0.0" vertical-offset="802" max-vertical-offset="1173">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4607">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state line="430" column="23" selection-start="18351" selection-end="18351" vertical-scroll-proportion="0.0" vertical-offset="5844" max-vertical-offset="21301">
<state line="51" column="13" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.0" vertical-offset="1080" max-vertical-offset="5595">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java">
<provider selected="true" editor-type-id="text-editor">
<state line="196" column="20" selection-start="5677" selection-end="5677" vertical-scroll-proportion="0.0" vertical-offset="2603" max-vertical-offset="6154">
<state line="44" column="13" selection-start="1446" selection-end="1446" vertical-scroll-proportion="0.0" vertical-offset="1260" max-vertical-offset="5430">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="32" column="17" selection-start="1171" selection-end="1171" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1815">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state line="75" column="13" selection-start="3243" selection-end="3243" vertical-scroll-proportion="-5.04" vertical-offset="27" max-vertical-offset="27523">
<state line="75" column="13" selection-start="3243" selection-end="3243" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="24285">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java">
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java">
<provider selected="true" editor-type-id="text-editor">
<state line="69" column="24" selection-start="2609" selection-end="2609" vertical-scroll-proportion="0.0" vertical-offset="515" max-vertical-offset="6953">
<state line="46" column="13" selection-start="1662" selection-end="1662" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4065">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="13" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1425">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="46" column="17" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1605">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="13" selection-start="887" selection-end="887" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java">
<provider selected="true" editor-type-id="text-editor">
<state line="26" column="13" selection-start="872" selection-end="872" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="56" column="13" selection-start="2124" selection-end="2124" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7980">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="103" column="38" selection-start="4084" selection-end="4084" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3030">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gen/com/thejoshwa/ultrasonic/androidapp/Manifest.java">
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="19" selection-start="193" selection-end="193" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state line="1046" column="52" selection-start="40578" selection-end="40578" vertical-scroll-proportion="0.0" vertical-offset="14214" max-vertical-offset="18750">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="736" column="22" selection-start="30652" selection-end="30652" vertical-scroll-proportion="0.3592535" vertical-offset="9189" max-vertical-offset="17910">
<folding>
<element signature="e#16405#16458#0" expanded="true" />
<element signature="e#44654#44757#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/proguard.cfg">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="0" selection-start="98" selection-end="98" vertical-scroll-proportion="0.16873449" vertical-offset="0" max-vertical-offset="799">
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

4
AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
package="com.thejoshwa.ultrasonic.androidapp"
a:installLocation="auto"
a:versionCode="30"
a:versionName="1.2.0.3" >
a:versionCode="31"
a:versionName="1.2.0.4" >
<uses-permission a:name="android.permission.INTERNET" />
<uses-permission a:name="android.permission.READ_PHONE_STATE" />

49
src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java
View File

@ -968,16 +968,23 @@ public class RESTMusicService implements MusicService {
// received intact. Remember, HTTP POST requests are converted to GET
// requests during HTTP redirects, thus
// loosing its entity.
if (parameterNames != null && parameterNames.size() < 10) {
StringBuilder builder = new StringBuilder(url);
for (int i = 0; i < parameterNames.size(); i++) {
builder.append("&").append(parameterNames.get(i)).append("=");
builder.append(URLEncoder.encode(String.valueOf(parameterValues.get(i)), "UTF-8"));
}
url = builder.toString();
parameterNames = null;
parameterValues = null;
}
if (parameterNames != null) {
int parameters = parameterNames.size();
if (parameters < 10) {
StringBuilder builder = new StringBuilder(url);
for (int i = 0; i < parameters; i++) {
builder.append("&").append(parameterNames.get(i)).append("=");
builder.append(URLEncoder.encode(String.valueOf(parameterValues.get(i)), "UTF-8"));
}
url = builder.toString();
parameterNames = null;
parameterValues = null;
}
}
String rewrittenUrl = rewriteUrlWithRedirect(context, url);
return executeWithRetry(context, rewrittenUrl, url, requestParams, parameterNames, parameterValues, headers, progressListener, task);
@ -986,15 +993,14 @@ public class RESTMusicService implements MusicService {
private HttpResponse executeWithRetry(Context context, String url, String originalUrl, HttpParams requestParams, List<String> parameterNames, List<Object> parameterValues, List<Header> headers, ProgressListener progressListener, CancellableTask task) throws IOException {
Log.i(TAG, "Using URL " + url);
SharedPreferences prefs = Util.getPreferences(context);
int networkTimeout = Util.getNetworkTimeout(context);
HttpParams newParams = httpClient.getParams();
HttpConnectionParams.setSoTimeout(newParams, networkTimeout);
httpClient.setParams(newParams);
final AtomicReference<Boolean> cancelled = new AtomicReference<Boolean>(false);
int attempts = 0;
while (true) {
while (true) {
attempts++;
HttpContext httpContext = new BasicHttpContext();
final HttpPost request = new HttpPost(url);
@ -1020,9 +1026,11 @@ public class RESTMusicService implements MusicService {
if (parameterNames != null) {
List<NameValuePair> params = new ArrayList<NameValuePair>();
for (int i = 0; i < parameterNames.size(); i++) {
for (int i = 0; i < parameterNames.size(); i++) {
params.add(new BasicNameValuePair(parameterNames.get(i), String.valueOf(parameterValues.get(i))));
}
request.setEntity(new UrlEncodedFormEntity(params, Constants.UTF_8));
}
@ -1038,11 +1046,11 @@ public class RESTMusicService implements MusicService {
}
// Set credentials to get through apache proxies that require authentication.
int instance = prefs.getInt(Constants.PREFERENCES_KEY_SERVER_INSTANCE, 1);
String username = prefs.getString(Constants.PREFERENCES_KEY_USERNAME + instance, null);
String password = prefs.getString(Constants.PREFERENCES_KEY_PASSWORD + instance, null);
httpClient.getCredentialsProvider().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT),
new UsernamePasswordCredentials(username, password));
SharedPreferences preferences = Util.getPreferences(context);
int instance = preferences.getInt(Constants.PREFERENCES_KEY_SERVER_INSTANCE, 1);
String username = preferences.getString(Constants.PREFERENCES_KEY_USERNAME + instance, null);
String password = preferences.getString(Constants.PREFERENCES_KEY_PASSWORD + instance, null);
httpClient.getCredentialsProvider().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials(username, password));
try {
HttpResponse response = httpClient.execute(request, httpContext);
@ -1050,13 +1058,16 @@ public class RESTMusicService implements MusicService {
return response;
} catch (IOException x) {
request.abort();
if (attempts >= HTTP_REQUEST_MAX_ATTEMPTS || cancelled.get()) {
throw x;
}
if (progressListener != null) {
String msg = context.getResources().getString(R.string.music_service_retry, attempts, HTTP_REQUEST_MAX_ATTEMPTS - 1);
progressListener.updateProgress(msg);
}
Log.w(TAG, "Got IOException (" + attempts + "), will retry", x);
increaseTimeouts(requestParams);
Util.sleepQuietly(2000L);

2
src/com/thejoshwa/ultrasonic/androidapp/util/Constants.java
View File

@ -79,8 +79,6 @@ public final class Constants {
public static final String PREFERENCES_KEY_SHOW_TRACK_NUMBER = "showTrackNumber";
public static final String PREFERENCES_KEY_MAX_BITRATE_WIFI = "maxBitrateWifi";
public static final String PREFERENCES_KEY_MAX_BITRATE_MOBILE = "maxBitrateMobile";
public static final String PREFERENCES_KEY_MAX_VIDEO_BITRATE_WIFI = "maxVideoBitrateWifi";
public static final String PREFERENCES_KEY_MAX_VIDEO_BITRATE_MOBILE = "maxVideoBitrateMobile";
public static final String PREFERENCES_KEY_CACHE_SIZE = "cacheSize";
public static final String PREFERENCES_KEY_CACHE_LOCATION = "cacheLocation";
public static final String PREFERENCES_KEY_PRELOAD_COUNT = "preloadCount";

3
src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
View File

@ -105,8 +105,6 @@ public class Util extends DownloadActivity {
public static final String CM_AVRCP_PLAYSTATE_CHANGED = "com.android.music.playstatechanged";
public static final String CM_AVRCP_METADATA_CHANGED = "com.android.music.metachanged";
//public final static int albumArtImageSize = 300;
private static boolean hasFocus = false;
private static boolean pauseFocus = false;
private static boolean lowerFocus = false;
@ -117,7 +115,6 @@ public class Util extends DownloadActivity {
private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
private static Toast toast;
//public static Bitmap albumArtBitmap;
private static Entry currentSong;
private Util() {