From 879d86eaa19dd25a91621521e9b00dcd27ec0322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= Date: Sun, 26 Jul 2015 18:15:07 +0200 Subject: [PATCH] Changed package name --- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.2.1/taskArtifacts/fileHashes.bin | Bin 317358 -> 458331 bytes .gradle/2.2.1/taskArtifacts/fileSnapshots.bin | Bin 1251027 -> 1753379 bytes .../2.2.1/taskArtifacts/outputFileStates.bin | Bin 25922 -> 26102 bytes .gradle/2.2.1/taskArtifacts/taskArtifacts.bin | Bin 110556 -> 125282 bytes ultrasonic/build.gradle | 2 +- ultrasonic/src/main/AndroidManifest.xml | 18 ++-- ultrasonic/src/main/assets/html/en/index.html | 10 +- ultrasonic/src/main/assets/html/fr/index.html | 54 ++--------- .../activity/BookmarkActivity.java | 24 ++--- .../ultrasonic}/activity/ChatActivity.java | 18 ++-- .../activity/DownloadActivity.java | 40 ++++---- .../activity/EqualizerActivity.java | 10 +- .../ultrasonic}/activity/HelpActivity.java | 14 +-- .../ultrasonic}/activity/LyricsActivity.java | 16 ++-- .../ultrasonic}/activity/MainActivity.java | 16 ++-- .../activity/PreferenceResultActivity.java | 6 +- .../activity/QueryReceiverActivity.java | 8 +- .../ultrasonic}/activity/ResultActivity.java | 6 +- .../ultrasonic}/activity/SearchActivity.java | 34 +++---- .../activity/SelectAlbumActivity.java | 28 +++--- .../activity/SelectArtistActivity.java | 24 ++--- .../activity/SelectGenreActivity.java | 20 ++-- .../activity/SelectPlaylistActivity.java | 28 +++--- .../activity/SettingsActivity.java | 34 +++---- .../ultrasonic}/activity/ShareActivity.java | 30 +++--- .../activity/SubsonicTabActivity.java | 52 +++++----- .../activity/VoiceQueryReceiverActivity.java | 8 +- .../audiofx/EqualizerController.java | 4 +- .../audiofx/VisualizerController.java | 2 +- .../moire/ultrasonic}/domain/Artist.java | 2 +- .../moire/ultrasonic}/domain/Bookmark.java | 4 +- .../moire/ultrasonic}/domain/ChatMessage.java | 2 +- .../moire/ultrasonic}/domain/Genre.java | 2 +- .../moire/ultrasonic}/domain/Indexes.java | 10 +- .../ultrasonic}/domain/JukeboxStatus.java | 2 +- .../moire/ultrasonic}/domain/Lyrics.java | 2 +- .../ultrasonic}/domain/MusicDirectory.java | 2 +- .../moire/ultrasonic}/domain/MusicFolder.java | 2 +- .../moire/ultrasonic}/domain/PlayerState.java | 2 +- .../moire/ultrasonic}/domain/Playlist.java | 2 +- .../moire/ultrasonic}/domain/RepeatMode.java | 2 +- .../ultrasonic}/domain/SearchCriteria.java | 2 +- .../ultrasonic}/domain/SearchResult.java | 2 +- .../moire/ultrasonic}/domain/ServerInfo.java | 2 +- .../moire/ultrasonic}/domain/Share.java | 4 +- .../moire/ultrasonic}/domain/UserInfo.java | 2 +- .../moire/ultrasonic}/domain/Version.java | 2 +- .../provider/SearchSuggestionProvider.java | 2 +- .../provider/UltraSonicAppWidgetProvider.java | 16 ++-- .../UltraSonicAppWidgetProvider4x1.java | 4 +- .../UltraSonicAppWidgetProvider4x2.java | 4 +- .../UltraSonicAppWidgetProvider4x3.java | 4 +- .../UltraSonicAppWidgetProvider4x4.java | 4 +- .../receiver/A2dpIntentReceiver.java | 8 +- .../receiver/BluetoothIntentReceiver.java | 6 +- .../receiver/MediaButtonIntentReceiver.java | 6 +- .../service/CachedMusicService.java | 42 ++++---- .../ultrasonic}/service/DownloadFile.java | 12 +-- .../ultrasonic}/service/DownloadService.java | 12 +-- .../service/DownloadServiceImpl.java | 76 +++++++-------- .../DownloadServiceLifecycleSupport.java | 12 +-- .../ultrasonic}/service/JukeboxService.java | 12 +-- .../service/MediaStoreService.java | 6 +- .../ultrasonic}/service/MusicService.java | 34 +++---- .../service/MusicServiceFactory.java | 4 +- .../ultrasonic}/service/OfflineException.java | 2 +- .../service/OfflineMusicService.java | 34 +++---- .../ultrasonic}/service/RESTMusicService.java | 90 +++++++++--------- .../moire/ultrasonic}/service/Scrobbler.java | 4 +- .../service/ServerTooOldException.java | 2 +- .../service/parser/AbstractParser.java | 10 +- .../service/parser/AlbumListParser.java | 8 +- .../service/parser/BookmarkParser.java | 8 +- .../service/parser/ChatMessageParser.java | 8 +- .../service/parser/ErrorParser.java | 2 +- .../service/parser/GenreParser.java | 8 +- .../service/parser/IndexesParser.java | 10 +- .../service/parser/JukeboxStatusParser.java | 4 +- .../service/parser/LicenseParser.java | 6 +- .../service/parser/LyricsParser.java | 8 +- .../parser/MusicDirectoryEntryParser.java | 6 +- .../service/parser/MusicDirectoryParser.java | 8 +- .../service/parser/MusicFoldersParser.java | 8 +- .../service/parser/PlaylistParser.java | 8 +- .../service/parser/PlaylistsParser.java | 10 +- .../service/parser/RandomSongsParser.java | 8 +- .../service/parser/SearchResult2Parser.java | 12 +-- .../service/parser/SearchResultParser.java | 12 +-- .../service/parser/ShareParser.java | 8 +- .../service/parser/SubsonicRESTException.java | 2 +- .../service/parser/UserInfoParser.java | 8 +- .../service/parser/VersionParser.java | 4 +- .../service/ssl/SSLSocketFactory.java | 2 +- .../service/ssl/TrustManagerDecorator.java | 2 +- .../service/ssl/TrustSelfSignedStrategy.java | 2 +- .../service/ssl/TrustStrategy.java | 2 +- .../moire/ultrasonic}/util/AlbumHeader.java | 4 +- .../ultrasonic}/util/BackgroundTask.java | 4 +- .../moire/ultrasonic}/util/CacheCleaner.java | 8 +- .../ultrasonic}/util/CancellableTask.java | 2 +- .../moire/ultrasonic}/util/Constants.java | 4 +- .../util/EntryByDiscAndTrackComparator.java | 4 +- .../moire/ultrasonic}/util/ErrorDialog.java | 4 +- .../moire/ultrasonic}/util/FileUtil.java | 8 +- .../moire/ultrasonic}/util/ImageLoader.java | 10 +- .../moire/ultrasonic}/util/LRUCache.java | 2 +- .../moire/ultrasonic}/util/LoadingTask.java | 4 +- .../moire/ultrasonic}/util/MergeAdapter.java | 2 +- .../ultrasonic}/util/ModalBackgroundTask.java | 4 +- .../moire/ultrasonic}/util/MyViewFlipper.java | 2 +- .../moire/ultrasonic}/util/Pair.java | 2 +- .../ultrasonic}/util/ProgressListener.java | 2 +- .../ultrasonic}/util/SackOfViewsAdapter.java | 2 +- .../moire/ultrasonic}/util/ShareDetails.java | 4 +- .../ultrasonic}/util/ShufflePlayBuffer.java | 8 +- .../util/SilentBackgroundTask.java | 2 +- .../ultrasonic}/util/SimpleServiceBinder.java | 2 +- .../moire/ultrasonic}/util/StreamProxy.java | 8 +- .../util/TabActivityBackgroundTask.java | 4 +- .../ultrasonic}/util/TimeLimitedCache.java | 2 +- .../moire/ultrasonic}/util/TimeSpan.java | 2 +- .../ultrasonic}/util/TimeSpanPicker.java | 4 +- .../ultrasonic}/util/TimeSpanPreference.java | 4 +- .../moire/ultrasonic}/util/Util.java | 36 +++---- .../ultrasonic}/util/VideoPlayerType.java | 8 +- .../moire/ultrasonic}/view/AlbumView.java | 14 +-- .../moire/ultrasonic}/view/ArtistAdapter.java | 6 +- .../ultrasonic}/view/AutoRepeatButton.java | 2 +- .../moire/ultrasonic}/view/ChatAdapter.java | 12 +-- .../moire/ultrasonic}/view/EntryAdapter.java | 8 +- .../moire/ultrasonic}/view/GenreAdapter.java | 6 +- .../ultrasonic}/view/PlaylistAdapter.java | 8 +- .../moire/ultrasonic}/view/PlaylistView.java | 6 +- .../moire/ultrasonic}/view/ShareAdapter.java | 8 +- .../moire/ultrasonic}/view/ShareView.java | 6 +- .../ultrasonic}/view/SongListAdapter.java | 6 +- .../moire/ultrasonic}/view/SongView.java | 20 ++-- .../moire/ultrasonic}/view/UpdateView.java | 4 +- .../ultrasonic}/view/VisualizerView.java | 10 +- .../src/main/res/layout-land/download.xml | 4 +- .../src/main/res/layout-port/download.xml | 4 +- .../src/main/res/layout/download_playlist.xml | 2 +- .../src/main/res/layout/media_buttons.xml | 4 +- .../src/main/res/layout/share_details.xml | 2 +- ultrasonic/src/main/res/xml/searchable.xml | 2 +- ultrasonic/src/main/res/xml/settings.xml | 2 +- 147 files changed, 687 insertions(+), 725 deletions(-) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/BookmarkActivity.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/ChatActivity.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/DownloadActivity.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/EqualizerActivity.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/HelpActivity.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/LyricsActivity.java (81%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/MainActivity.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/PreferenceResultActivity.java (84%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/QueryReceiverActivity.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/ResultActivity.java (83%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SearchActivity.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SelectAlbumActivity.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SelectArtistActivity.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SelectGenreActivity.java (88%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SelectPlaylistActivity.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SettingsActivity.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/ShareActivity.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/SubsonicTabActivity.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/activity/VoiceQueryReceiverActivity.java (88%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/audiofx/EqualizerController.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/audiofx/VisualizerController.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Artist.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Bookmark.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/ChatMessage.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Genre.java (90%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Indexes.java (79%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/JukeboxStatus.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Lyrics.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/MusicDirectory.java (99%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/MusicFolder.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/PlayerState.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Playlist.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/RepeatMode.java (88%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/SearchCriteria.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/SearchResult.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/ServerInfo.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Share.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/UserInfo.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/domain/Version.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/provider/SearchSuggestionProvider.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/provider/UltraSonicAppWidgetProvider.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/provider/UltraSonicAppWidgetProvider4x1.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/provider/UltraSonicAppWidgetProvider4x2.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/provider/UltraSonicAppWidgetProvider4x3.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/provider/UltraSonicAppWidgetProvider4x4.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/receiver/A2dpIntentReceiver.java (84%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/receiver/BluetoothIntentReceiver.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/receiver/MediaButtonIntentReceiver.java (90%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/CachedMusicService.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/DownloadFile.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/DownloadService.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/DownloadServiceImpl.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/DownloadServiceLifecycleSupport.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/JukeboxService.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/MediaStoreService.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/MusicService.java (86%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/MusicServiceFactory.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/OfflineException.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/OfflineMusicService.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/RESTMusicService.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/Scrobbler.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/ServerTooOldException.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/AbstractParser.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/AlbumListParser.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/BookmarkParser.java (85%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/ChatMessageParser.java (83%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/ErrorParser.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/GenreParser.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/IndexesParser.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/JukeboxStatusParser.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/LicenseParser.java (89%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/LyricsParser.java (88%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/MusicDirectoryEntryParser.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/MusicDirectoryParser.java (90%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/MusicFoldersParser.java (88%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/PlaylistParser.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/PlaylistsParser.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/RandomSongsParser.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/SearchResult2Parser.java (85%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/SearchResultParser.java (83%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/ShareParser.java (86%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/SubsonicRESTException.java (85%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/UserInfoParser.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/parser/VersionParser.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/ssl/SSLSocketFactory.java (99%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/ssl/TrustManagerDecorator.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/ssl/TrustSelfSignedStrategy.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/service/ssl/TrustStrategy.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/AlbumHeader.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/BackgroundTask.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/CacheCleaner.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/CancellableTask.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/Constants.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/EntryByDiscAndTrackComparator.java (90%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/ErrorDialog.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/FileUtil.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/ImageLoader.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/LRUCache.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/LoadingTask.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/MergeAdapter.java (99%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/ModalBackgroundTask.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/MyViewFlipper.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/Pair.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/ProgressListener.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/SackOfViewsAdapter.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/ShareDetails.java (62%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/ShufflePlayBuffer.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/SilentBackgroundTask.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/SimpleServiceBinder.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/StreamProxy.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/TabActivityBackgroundTask.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/TimeLimitedCache.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/TimeSpan.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/TimeSpanPicker.java (98%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/TimeSpanPreference.java (95%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/Util.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/util/VideoPlayerType.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/AlbumView.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/ArtistAdapter.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/AutoRepeatButton.java (97%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/ChatAdapter.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/EntryAdapter.java (92%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/GenreAdapter.java (93%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/PlaylistAdapter.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/PlaylistView.java (90%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/ShareAdapter.java (87%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/ShareView.java (91%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/SongListAdapter.java (86%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/SongView.java (94%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/UpdateView.java (96%) rename ultrasonic/src/main/java/{com/thejoshwa/ultrasonic/androidapp => org/moire/ultrasonic}/view/VisualizerView.java (91%) diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 0e0f7f7b7cb8deefc5fbae24c48726b31b977bcd..4524be8647c30d9e63f9de2e3b8b448bc2159fd2 100644 GIT binary patch literal 17 VcmZQJ+bkjShpix<0Ssi;0RSZ=1GE4D literal 17 UcmZQJ+bkjShpix<0SqL>0VIV382|tP diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin index c1633ce622efbb18607ec54e9f64012bec8d3cfe..906580330b82238dbc1a6a6658bf4bcea017a209 100644 GIT binary patch delta 69724 zcmb?@XH*o+7Vg9*2sBARf=C>aIf0^r0Z}kuz=#1+!JIIHf;pkWs9PlGj09m66R4;N zW}<)sq7qdUM3TPhu9>;aUH7f^emvJY$8)~@?NGa_cJ1!z?$jG9mAzV*jI}x4J~|8r zV?6qY@%zAOEzy5p&?ZgNr}n8cl`?HKteB)6_k48nIY)}dAUFd4jzQ_<(Xabu>@)Of zjPq5Auc4{OyL{m4nxG=eB;o~!{}cZ44GMBumhh|_WyV|Sj=0MC%AjCL7Gs%0m^DWH(Zp#0m=}SJY)(G-; z8;QA@)qHoYA&N(TEI$6Ocw;sOJG%KkS{_T5eQ|tnDspA69@}f&-e;=24Re!5 zi}3@!vxoz=9he^$FUC(k|FwIBVK~O6^7u7cP9&pxzwX@#cWlFGCf`I`j~uJmv`V!O z+a=a*<=bd`kemIgo?Yp2p?RF*G5m0CE7Duw9(@YVV|zb7^IvQGlJjT(P5wUVAjU!t zXWHv1F-flJ`-Me=-(n}x(){^@YspIo{$7o%|AsN67QTtD6Yoy$>d+T4IB@Q&J)*!* z7QZ<!`|prO0mc%QMBFpd zhWy+qkzpA3Xw5vWZ^|Sy_cZ9mbgZC3ZnyzI-k_GWxv}G)_2fVy(Vp*P=)~Lh)hp-C z(p1db=r1yQcJJOjqf|Q$F*kW4|Cyl^S2WQFeRx%>RFewLX?-)|&wbH^huss^CV8(o9K}- z%=k6&!Dbk{;l&R}*z0`(>gRXwr7_M|d;TpGOGUrG-~KF!u~>kKYi0NiCaW~dbwvIy z9DeU;;c@LK7Dw*m+nZXEp_4CuC5NoU*t#nIep5X%Zrp|^ssrz1%=8)ml4&hzBzJ5P z$0-S8ykUHIvvl&97r(MTM5wD=##c1AB2$WVdmewo;b&{}dv=dwe2e?74mSKZ9l!)%$P`u&S@_6RC4XlTrr9-&8C22AjNy;Bt{ z8y)5k8DT|w=3mG=JXgpYFfnuf2rD*u-{MWiLj8#}kyGx+_ZjU(k^$wZ2T7bmZg>Iz z8Nw#k+DjL=9>GrJH2I2S0?C`>R<1o!KL$Gqb>oMRaUwqk-cB5tpM$YfF24csY&YkA z(N@3&$pUy64-ZpyR=jXNrQy0o5;X*j?Cx;wUAOwUYEeXW~E1(|2*~f zZc8(bajGWr)2y6$`$Av2Wn8+5^_dM~{R68bj%hy@o?e?)X8y5iWRiIoA5P5^;FV2S ztjjE)h_>+UF~jX9?#Jg8m$!re$GVn`fBt^O^)a^CyG{fD^(0@OV)ps#jfq<@cB@L{ zDbztnOT+jK-fG;i=1lv^JDFte^ZU!nWQ1#aa63P3iWOP9EV$A>ei;sxqs*_F(nao_ zJVmMGYY;Y?sKtM6Go2ILKGZRDzJ2@vmB9|uw1mMJMEy;4%b4+BY&6asxhPLZg_Ofv zK`8vPbc=T;ch@;mg;d0=S173aG&DRj%2$r_zs$kfLbd__<#DIXaVK|;oTYHdE=bL? z%?wW{XBs~A7#ick{g(STJ${GJ1IE@pbXdd|^&1NBZoKpze~$itP9%^1n>}_pKTj}l zG-2`fg?`GHZ%3Y7pmFAMyr7u(?W<1d44v<2beqOmyK?EjiCdTWZ2}E@X(G$qVVYhX z4YGas^xurHw+AuyZF4#K4U?Ix^=O>?aHMHtRHMSlL_CF@b0sv+`uK~lcWdAZuE!n6 z?Zs2uV@@_cEnJ_iTI*ogn;4z=4_HYPylQSoG&#}T~7_L9``|2NZH zdADOpXL^LUdV1Pub=jhQ48{mK27@`6|LE%ha{T!hfiBnTXgZ;7#2?+@OZxU*cAwx% zPa}iq-N;XB&?6I#9KSq`7=d|;yZMhAtau~SSAKDo!kdhno+(;o-7^ZBBV-l{3w?Ad z{}-~keRuu2)I%Xyzjp+GbEAR0nz_bzJR97YMf_up&lJ0RlP6D()m%fC;6l5Rk$wFZGgh?6(?G~x z;YYRVk%t#gwobn#Jedsy{5uFcyXeQKzH8~&T*fi}yHBlrNU8rCizwO<|Og zcln<>tjK+;-&dbB*hK4d>eTouzdgv*^Lq;(oT3>EvQFPUWl&S?p)9 zE`Q-4J@N#1_;2O0ziEu~aXNqVA1mG$>4;b7!thZ?tiLAm&G{PUS{Bza9CNFZ_(6Z1 z$ia4>wobND!Zy1#Ge7-NV)7Or*|r7Jc4A`vWRU^xYAJWM81Dj1UO$xI+@(i)@9k(( z*?$~k_rLMk-A-ics((KQmB!E*@iUU|(0xsj+c0s@h0E{+6C>jImEC$I$H`$2r`iD% zf1rJbl=b~W?p}SFjCnEV`4fBec$2#VUTxFFvq3OzMF9~`($g3J{_BSIJ+k==dpyYe zi<=wXR}0t8#%_LQ&wLZ2*Kb>r{rG{H*mXr@KuUG5%Y3O+yji%t1Nc2XPUQN~ILp=9 z`!P3l1b^{_X1-yPm$MJQoBqIt2033wK_QcgTJUR@qk8A!&X^li z04gk|9{C}EPeE<)1FUYk7R*`9F4E_0VuOXhaCb#~04+AtioEUpRdLn=T#h)k86BU{1Wb)qEZu9P(r$NqF0en(KIn=B;ctXv44rZD!5|}F?Z{*X4uj}0k?qKSB zB^a%YGFzALz5hw$DNIfN0S?N{m7Ha-A_>8Rvm6hWz*>_zZv%5QocCdBDzIW_XRt7i~$Q@ z<`5I>j-|a*4j*5Hsrr$k99VbOj~w5pUx?XNyJ5O7nqAe>;ij{ujK|~+sj!Cvjgw^6 z23%T*!Ho|g8iBk~$2RUe)r8vuPPL}U>?C{r`yux?;(E^ASOCSoDBP`~p*dG0m9d48 znb6|Pbm9fnk@>Q-{V}*kd>diXEw}EM>ScduoNF-(#vEnVk{7;SJUjNYa2K{4f!r~s zFG)PE*%bF#ctMq23da%1dzJaj&VEt_tjElJr4E|;3V*V7>9Ln!Pyg;K2hdCChjg;s2NC<*5g$TM2-@Nwwa z=U81!ATm4EW@mf1bv*8|2<|F~rpT)s;$8jLZ^Yza4>5V&y^W2&o(&i$lHu+twAPXX z_dJxJvI@J?NdxWEXj{C~AuLX(3R4l@4sNGWV6}4-`L3dy8(EJ8UZ5g1=OEGCU5-6Jf(3Q_t-?^Nw7G}EFjHd?Q>V{#eTSf zCD3vfEe3y`fOMa6<~U6AIpB58192Cs97Sy9lHlB#|JgKiqoehxWO z30pksPMr@8ay|uu^?9^JSLk&stAq}qLE^WTC?zwlD#^Psrng}WtGI9+k;$iPYTvn! z=)|BPABxVS8oJ^A&#RA0)36271@8Kx4dr$H={DJ(3=C%cf)+oN(Q*T$_$L>IeX+q~ zaJ+y(`%Oj-55C9?)h|Qx1r)!p(pDc<`3vmmx*Ql@M6(xgcu;*$5_ZI0Wi1MICbX{X zd|rn;0z&5_SYJc|)CJdO9?Xiy7Lsql7G!~Jd*Eacb?Ytm<@yAUUqowdVAzd{=yrU3 za(`EV#U*AJuQA!?{>w4AuoD~~kuUoevqZziI$N>X8)re=A4RJqGvo#Nv>k(KBjB<> z3SfAx$#`o8z+lcx!DD|^*?InnhbM+t?Zpwe<%sOg4wG7QYaCm+uFR^Tn2!#U8iS*X zW4qU3a`aemyNvS1D>$*{kRCqRxjMG+_%fQ9#e08V+xtn_6g7SVxhu>9-m}=uJBLE! zaRdh9n=1~l7nV2g3B*Skk>~?OS5Wm?s_~d{sA3l;YyE=gt4w!%i^Ev+-7Ga7N&3=)mM|u|;(g=q6!7gFUcj7+NP%1gQ;$v7R(<>Wt3Y^$>F*O5Ml(?( zJy}O*p@C~SZGrP)19-)vRILp+{{H;VV+=MX36f(eXUC?^&zw+Hj-3s;BeN=ag`Xt=cK_ zmFvDKJ2J3Cc<&`48C>(2R!0u`zaJ0&2eGdj@g2zA<6Wgh>AZV1&PWj-1-U0L?0Pr( zf$-emz7QJ^@_z8FFl-Xd=LTDe@sRJ|MieICrN-4AC&pvS_jILZ6-(pLhfIgWJhYGU zl77Bcl#0Yw%)8-X9!kf+f{|UkxDOb-@dxxDqGk1T+rO6DjC>3ZafI%N%n1s^^`2{v z5jM+N=fLa{BE|+EcbjN$js2J|7qA{v{f2$*sCspGEgI##7l3R&a^&|`-hb|kKSJ<3 zY|2L=JrB|>&Gi?aefl2TCLgVAm70 zhvkN3e2wVEOrj?jnx3F-%|dQBRrr3SJSB--qI^fSa=lW`!CNHe($;&^Uh|TgWLAd}$T7E;jXvDG`7>s%YXA784Q$`AO+g#V-?vnWaT4eU= zT+mL~6It1UyGIf1l?^kBrZsXprd9grkKhuu7xZ+m1_Po7^rgbQdD^ncC+6mSsd?bv-kf zT7*jObDzMsVWuirJtha5ija2;9p1Q`hks#Ew-{!>KsMo$<^yvb;SI}}pYZSn+D=&$ zTMHIs3hQEb68wCDrX@Kit8b|d)=u9JvM-r>M+!`j{?48L6oWeApJkrEc@=p%W*n|# zoVAxkS$SS7<>dNJXBOtSiyNKiKa0MW3evNFl1($2uDqPU<=>% z8q9vlRN^TlPEX{0JEbR)}Tc){+0D&IF? z@YiZEd&NwjBD=e0MZq^512ps+>NoT@xxc-(om{qH9$XgUW6-=Xtc*KXRBDVK5C=VmMe z*B;kTgx*{+uVWPXi z_7(qDEle}O&ORQ3fKqfqT=F?^+_E48gXMi96K?_xtMBSn30D*^PK;kwE1rL2=rYXz zFkFmB`ySsC6p0rPyJ3nLPdohaXiLpmn$I;jFUHePo7cM~e1xV_=2DY4AMb>zNE_kv zh0wSmX7$BxFIhPjuLf?%Lzqy8QZc?eFVn3bb~ zVKAvRM)A}T8YIHi;4KBNS7=}1ognP{GS|Yv3Um%^DOJx4n(T_1?js?f01E#B4M+qON|6t*X! ze8{Llh5JH#e&4UDmxOWYLw5~Ic}{u8m%WzTu`{EI5Lt_|+u_5Wu<*|f%)Gl8H0zj0 zC-WVxu1+3JW1L2gD602cZy!mTXxL5T%$?$5_nEDUevl^q5lDszF|x zE}V(3Nn#`Q2AOroO_$>+GR41AzOQ$4x7s$&5C;;$0NGE>AvW*Z1D;=QeRCS4H;;*} z{E-?P)OAW&AsB1L_+Pb8d%f(0HSxhJf&M2Z`gu;Pb6}eDCt)WM6$s1g(PA@ooMZqY z!d+kU40hEsEjSKSD$GGoo?{?5@r|i_;eY*1A`p17JcbRjb+MN9tQO?r7`O(DMKOS0 z5^E$m#bbNB)^=Q1xj&D>tR$8PuW-11QJV1XBVi)0%r159LsKp-5Z>?8UI__FtaS3! zxDn~^X5Pg^zdjwDl35<)n-B|z{|9**mvIkL}f z`For3G?VzbNf433LQAN5pZSsQ^r0AS87yc^WuY5!%E3cN|C=3*QJo!dJB{VUTS$)B zGjohO4RTXIiH5g!Vasv(?ukI-oQloBOlLWf=XS^}SZ?qWTj+F$S?Me*-j#btA2yH2 zX1P7$O}F;?c;1n4jn$ak(gz39S$gFC?6=R`Ty?NJ-EH7cfgcWEZFx5UuQ*~|G$c@F zwJu+-|7MS`IJhxAqQG3&Hox-Bdenq1+|7pyL?#cp8hxw>oG`B5HIT_b;KgZ$uSQRu zjF~}(V3mP<1x?y*`YUV`2ICySDFcn`##K_yyT_6SiNW_EFoR{O==yWo!;;s^p%|4l zf`SY*HTDmuZ8T~X-Y-%g3Z|K?0$$khY1=O?8H<_i;ySf1`s;WHYscd>&S{Q-#!OZq z`AyOIbgH#*8ce3aft##!-c+*XK6CD0Y{BiQXtZuK!anZ3f6E8soLQikg)E#s<7L74 zjO!60bq3P2&=`_dEZVp+4R23Q{a)yzm~w}*;|E`h#{s;zhcnr%O$rtrw|urlW0P9n zpfMYzJ=UOzALDQ0s4$e3|#;knkwnyaQ$lP-2L8 zoUFRj!!g~%a;rsQ#FMjwEG~qoo-esjPDUkjeGc(eIW^(&3h(g^| zcgNo0Qp+_R(>lgsVF`2GS{TbDi`j*AZdZ-CZ51y^j+9F6Of8j&9+WS@RZ_Jz(ka zYQyfWeG(=-4chBP0c`#>a-RO*>J&U=?p4_N0Htx=#5*fa^r>O9i9IkY7y05_&Ahzv z_8ANs2f%?`G>_qx$<^VHlrXr~4*YY`(w0h{@S?j|c#-#e6X@k3^@)jbj#sbm5!yTl zP87KO5qtl}v{o7<`fh@69-5j{?>dY4^YGf>b|pb=9&&Vk(qpUO2`4dA)&;uqSl93! z7UeSXjo|h(RxLrUxMsZb8eiC{)Ex)^SI8XyR@)e($VId!r{cY!?G+2%%eNXQXJ=#W zjnPV;pz#e$Ns1hjUS~34)=i8yErhmmv?<;#vwRX2I2nVV7einL>paISW!MVA$Vyfr zXVAz&gIu?CIlRVw8+Y|XQF5X0BWomY($KB<9mC$!>cn3Ik#LYrAb);tEZ%EemzQ8v zgHDp{43&q!DvN0{_t#7KT!Zr2u;JP_xtx4#!Ke;AYtbC7a$qT6U6hKW`t%y+)S*!C zL_Fqwsl@l}xzS&sqmG*TogHef>bL?Er1<(vvvEw}*(biZEO6>SgZw9SLMlBNe)@AV zo@F9Y+)HbztkjfS@(gE&=;p#!L?*4zawi?$hEF1*w-jDb;PDxmKh+twINBkHU}!y> z=$mWKusA=qVbJvgxYVP-o}3u*HmVfYMQ)g!C^K3w_v+jmw4nx*6>Gt>9&U+tdtw+AR?x{BDCTr3l_ir@J`HVo#Ov~+h>caKk^cGS+qsq!rd;aBhBPP1d z1Nko~sH5EZhN|B90+)Lm-5C3Vw)@-0V{`p{o@3{Nn{eU_iu6;=_(!@bQdm7t+<57H zopee2<;ooxH|T*7%B;<)3!j@?ENGBZmI^N@a7mkWc7bjhW*U}5A2LgNzFpRIIel>+=PTY|3$c}=Nz`*zySismhp;ka zy#bddw7j1x%{%QB`~;H+KLwp;RPNTWg6an(UBF<!hl~iA4Ic8=uAf$yA$Yc85JeK!#BMowz#Xn0JC})=+%5lWYn;UrohPI;2?7TMa z0I%&Jwh$B`aA~F5uZs!(e0RrB*u>O zu3)nbwcy>3%&J(~+_>!HNrT)>OQ>!~3+d6#l(={QremhGJG|&X>QypoH!nBEV9;O| z4E)Wq#0SUUh`s_rM>h*SC$i>c?NV#e<7C=zVSOLcym`pHc!WLPot&Cwf|NeiG7fpV z^VH(xuk&epoR7`W$7I)%W1}=H_4w~FSQ`r^EVdrG!7$9=nIB%QoX^-_Z|`=3U&p=CUDHO)3}c8H?PL`_Go0^K3bU(d;zv z8prk^Uq8MT)NQwn28q@&P&JN?9(rE&*Eo{dgF&VYEEyipHa4 z9Z_xe8(uOPGfm{69x-{Pv1U(~Mhjct4N{_UMpm3vNr}_sV6uiRth8iXk&HiUHAC!w zW3wOS;k+d>JM{eI^_K_WGQt%&Lo@~2?Cto{xD%HqBIX#}rNB+eT0{0mY``|zTcFqy z&6dXXl|2m{To|}US>R^H)>l}t@YH}pMNHhV7rd;Hwz=zZ*D?GdG{{YP0hg`V>EuH} zOLF$+2n_aY0P6{CAI0dN1m30%D}{}#*;cqY0R^vq=-63E!96OW&M4lGt9J0;p6waphb(lU8B|lJh|7!YAg}D`Y!FgMh@TVg+Symr$$46|AgBDx1yJAA`od##OYTQ&3 z!R6pM6;a1bD9!HNfHx)QlPe@s;Ca{hsh%^jGJv$B#if#AB{@Rm)GlQ+i<3{dNbP!|; zsoElc$x_6Q2l3;D+8Aeae{XP}*+?6guo=hzl(p!<_xiyiw6 zldO!G_%dnIAB_Ik2Q4#ESU=WXuS)X9hZg7SH{jSKefwGV#I@<)FjM?ZaT6H zcqHJI=wLIcQleDH`r}jX6LVzsJnsJT=oQoOJq^)NW3Em-C#(bi^i@M?7i@8weY%e{d#Dh%eLZ8NU<5>TE7wp zCGZpZ&$RoZI_%JDYm5*135N67e-tyjV|8zj-#>>&i2-$>Iv;JS_*05kbbqigRks>A zPACKSx^fk*%dkG7`W(hkU?cDMqWP07FthU;U&B_9RBw8!QS_FNu@H6s2wOb}abjzb z*593ZOW)u|hHJP9lATZnj_({-ViqCXz^(ycxBv|-qkbX5z9EOBGHHS>3sANn`ajv< zpgRqNN_qTC$k&_A_sun&TCuOR5<&0+wk?x)!20+Zg(%#uaAP-%QjmRkS+zx_b1lv0 zG+OiLPt}8th3pYzgMx8GM<%}DB6#aTdl4F&TpQoVQTTfVm-hi27oj>96kZba?ez!j z@V=7BwBW{;nm32P2piphZD73^Mclk->CTu#aX4b5-TWQX^uTj5yPVuKI_pkyk17_( zWb+%QSqZ$I**;A2`juqq`^SZwDTl|8pH4L|1AO=9?Z!Ss=J9__cLKkq?0DXT9(|v5 zfipIvBmN~iC$BlW?);oijGO-B`^?ZIOY2{4DB$5fl)Isce{F^(cr9bEB_~%dTq`#U zcgTc{0u(PpTP^tMWMxmH8@s&onQvp~1TU7OOzAYat!$~R#-+=67 zT$}_~P_%+A$Ktevjz|*hSiZjQn9vox)~=W z6qgq6y-1jJ3B_Qp=6`?VoG_Zo-EasNQ{e2MC%U&dPQW0K30p6rlon4Pe%yZ=Ucy9( zBFyk-d+?0SZ~QU2tB#qsVnktm;=#eB;zcuY1SxqCS0W3RfHDgJLus2_Q5?U{_Yk41P*{4Ui3QO)CPf@I&n?4ps`}^Sg zDBQK)kbebPkV#U$`sm{iY&JFuswq(O-MuT@_vX_er%4MsuAp+U^m^8^ZTn*|Q_u%n zucFoZQ~xAk7_<;^0p&yC!b8yfE)2bnQg~#I zyWPeG*D*6{u*hsv@RoHulLSdL&dr?!+#qB@|6*1_O$$D?h-O=u6NIMAcH;UqiZ_m9 z3ySEzKoH8-$&Y2rp4Sr?4BG*VgVEuh5I<|{-k*5I6UKu?zM8YgDO_H5Sy;lP%U~-a zlOM)wly@iyC*l4qI1!9eds%JK8z>NjCW#@c70^LHlPuxd*{B0sBT?d)4~`7+ zsh@=%Zf3#>1oHNzos3s_wwwkz<@utJe|Rl>yJyz7AWT+dLr5fw;?mEg?1`E;F!(E5 z@Hvu=evV(4eACb61FoUm?ENq&8jY@Yv{seY;|xp{$cyZ@)$JQ;z3+4{#(&s=d<;tR z_EodAOHSd+L^Q2~kQn4_Z~k_tr=Rc`xM`vAIR-UIF^58qw6KK-9&^9Q?9X`CoIusQ z7qnS!!eqg~SoTO3uXu}N*`Up1v9oV&BKEJ3MK&GoJwn`U988KwnP42L%-?G+T-IxX zMC5kD4YaK3E-e64~iI?#>?Lj=BFZ z7%P6v{Wsxinctwh1bh5>8}bv;NOYSGw2$uE1%kFQ(eHL~ZQ~j}#0c@yFL>aZ$ zVQ~I^6Q0b2FN$LRJx}UdUJh{%lLzhs`6M(^FO#m6=d}oH{q5O;kR<91+R@UIT|N_^ zHiU&a+)GARXEA$**EHV3>Iw=_lFYW6lHk2=qTnd~T4zfxQpVibQ6_FBnQ|QS7SLx!>V_72C^PPjN-V z^_eG4q=p2g#XsA6{VF=J`|}mIQTz|BV_j`1^M?FQrwsouE~eokz`!nQ2fQqxTo~{x zPAxP0zqrx-glCL_-E>{qIuj0kK%*1A+Q?zHQ~nhKoVP&sTBd=Z^aJ}Q$D~+>wRDcb z%Zh2r*V{GC7fzvL7U?ipbcuR2x6=tSKC$ggmORiNkUf~`RC&r~p69`vD4}SCV)k(Q zF#pF&9Vi%5&-O4e;S4?z-o8|JW87+2^MT`+NlDUW=`x&@d{|15F2}i|W3s)lZTI*C zvz9U!HN@=g8-@8Dv^XeN8BmN4sQz@l6pFq~M)i%rXeH+$*F46kP9&n(|U*y(E3OJVjSKWS=M)=gPUmGg*CNv|04x zn!95*`L8P*vid!yE7njn21ABk+O`8aE(r#m_#)xqLr(e9bHwRqgC)Il=zb#L=in&<({ar0EEKNP#Khp_so&eBFFDAE zboL&WRFFZVWia-YJ6H-*lQ>sQjx0_f5<9CjXDP2qvrp>F-$~O&TZc7VmZINETt^m- zM*m@k{-L&>o}!)9kwFn-%(JC*o~HDwzf_~u#Oq7S8<7}FU!rv8|Cin@iyS}q-xWu- z_pJYs8&c-wgu@f1N0+X^=hip5c1bAeD=}*Cl&&`9*-P7$v5jZHD@S3VNfrevcaFaG z^hEFN1-N^jWvD8aFfwR~arW*P;84Obnk`ac$PJ=`wDVWqNV_sc|3ft70aNXr-7}M!C6O_{(!a;j^TgGl>&XOWYDy)0d`cfjbUynN6$n*ff?|u z&){lZuXm5!0YE8-T895~&xxX9;63N?ar#Uk$~fLf^b}{fMa<>T zwabt4GuXD2)Xe`c`}FChQQ#I>_+O*{pCws5v$!O;w0u7J-}Cd=EB9s;>p){~?F+?A zM_Ptm#WO3a<C)5>%SF?`1)mE6{* z?+(hnUu`~f%99`O&>8ffT`$LANYjVM<+$Dkd)N|(h-5Xhrqi2e-J+y%UV{-(H#DSQK?Iu%w+2na7qkT!dk8bCn*s0jK#l#TkHi||rH zAWKpjuOlYE1unn84|W12SmkWH0VYWb=)08TN)1kdC%?ZB_AN?dSa;uDNR|)`pl^?j zo)&ThK1m3q&^BQ(Mz!vI4w{$yJ7-;{1O|g_+F^l&fcQuWq%{_=hO?LZJJ+VKv))yF zlYu-50jr79aBXz-fj<(axV4nv;f|O4VZ@dGrnm)^;P&ys$6=#{0AFcDx{ptR&@27J zWrt82RgU{Spj1Lb?gk~ujCybbJUdf>Y|GGQ5!xaOrXEk`MI)nV|j} z@@puKhw<}6!B#>btxO4KZ$vNt9SG_l754)rxN82`64GdaC@Ky;z=h*il)_g@K_R7K zc2&+A1_$>~JBOeIh406Y1LxrWX(!%Lg6G5b2Z5i2fOCQpct-yYg~t-6l*dy7-=v2x zp;tmfs*@6|4EHR8(INduKJq#xNU15cg3S^F?=(t~7?B|hQ4#_vdgE|qr4B$PEf7sD zhhA`b%j;A@CA9xIq<2xK!v6f61hYdWMt+16ME-g84vx|SQ4-lXlpwyna0%o{2#67s zU{kp4Huxza;D%9x=T0V@z$~o4bIwRgkaf0qKdcSwKXR#ZN)YF=ZWRPd2nhO&+W*zX zAKplsqH9UX&|&@{9p2v*N#DjZHJCpJY>;4vcz-C+?YwhL_ZIP2S7vUlDgEB}>}Mn8 zox$9nCAv=E+N!uW_}8g*G|v573AZ1jXWQ~LwGVYp!?y{!ZYN>ZBLvzuSWjEiKv!r6 z(Y6pO9-+rec39Yc>#Gr7{=0jC%wq(G5179A{G@Jd^Iip5Jw{K#{g&Ren-_rl9b#Y& z)ILVf3~%ome8ci>5nW&z+@B7hl#ibA(0}vIPZsZ4Mdpt-GxnanjXS|C+O*+Q=k2Rx7gB0J%gL-32jf% zlh-%nMzpc`udvy5;-7tX3cRLAT|G-LLk8DuGUz=;xoJG8;n5Uw2D?ibEpU3uLNBzp z?6w|Nc2$^$yobOnK#$XmSt@ryLFzcBhM$171t<+i+Z}eU3cr9sqa-*`fQ+7;qTv19 zVlxKQt0AEPWie7`U1F^?T`?F$pBJ=I%)$e*8>93#VP=vG=sibF>9Y-k-;ASI4TEd) z6FiZ> z^5q%*-P##GeIN$i%SB|*Me{r>YOT{T-n<`n7NT)&`r^DM(iCTakb4Mc3R%xgJX@Fb zDXm`i75lrXDmL+tU%PnKIeH^Axao2*tB6`Q#oMKxFL;8kzpe~d*@?VA=b0!6huNA_*YgDcpVTsPRhL{l3u z;FRpdz)0-O)C?kCqQ&+3*?_iJx56=Vh#U+;56bd1&TrN(yDyyDwc_{j_RoC%V#2I} z^fd@tTvBl06&mdSdeoM8A@*S5U*H~ z8U6 zhWsd;Ko@WZ!7G8=Z;+$^dej%tqrOh$smy&H-96i}&3`H|@-0&LW9xixxX!t&Xu9pmMlo|NGLpFVn{Qm8xx`t*FT`!>E z9on*yiD$ePB)!J!_ry6lRFTAMaF9#H_*xRW-k|_K4Cp91HAfGF@oPY-82OT}57am~ z4~I%*kAySDC?^}#S$nsU*4WptZ-T~R)<_n)FyW=92lp06W$Zwy3~i36I;|6{^p;?w z**2nC@y>QWx7zkF-D@)lvluv2hQ`o9?0RX@Q;W$PGT==a%AhgJe!Q}da0MjW1G5}4 z13C_<4Nt&%A=3O|Ryi7N*2$7bT89g80D~Tjd>wu=krgqJEBxuJuLTa2qk;X8r>*tK z%|oTnWtKQ#3#R@cQ-K0FH8N`Lz{S-#s((3PRe@6QKc35WBEPkk?q^*2hMAGSptgcF zozpbVVPks4QYApQcNO7uIBVd4T0DLFDBf#fI}g&r`*%S2yI*1J%gW%ZLOCpalB=cC3LV5(0dgelWhx3@%3WKfH;Rw5dvi26#dX#JvVRR=p6VSI{S6 zYHARr@x1Z(9vB-b;oOE2T&doiiGHu???Z~Nwmtrt0MQZ}Y`T6~p0NG{RT2V)Wt1t~ zqF_x>jq2|M_hm8VS1y5LRR3IY=t@*$vr++$Noa6`DO1Tl2j0LP34v59CCHh2=rH_} z5Xf~=fAv4jBMWK_SNGzM8=204>no6QzOq|3F##4et2C+|JGcD-zp#XGSoZigi?G9B# zWL*Dn3Hkv0{6sYu-b-i@bg4PFH8BvB;`?iGLMVf;_ngy!S@HeD#Vhf}+0r}UBO&0@ zi{X9nta1=Ym>R#EGL;&lqzm6AG&q+i!MnSouYqwwe;-oxR&!szjszD8fy_@zBm_(7^Vh!H?=|d9?C*n3 z5Agi)<3W%hp}}>ce3O>5Td{%t;ZRQ8XGL(iaw z&yG$Arv;+rBSn|_CL^!2P$pqYiryb7ZRT}AR#B!z8k{1^dDfBEwO~gJ#H)lp3j0<* zF$M3c{!vMlQX0F@7@dbK2~%8pqMD;~r$LLPDZ00Nb@;Rv7*zKk2VQV%{>|5bp~0cUP0rRxy!xTP0*7w;uLV}F0?QBmeREtW7umaR zw!wA@!6>?pd1g8*L#%|rnZBkesk=EGswD&*x|>T{Te}}rKlXR7dW`ZBnHOXZjvxCw zm!g-|;e(vJa7;o&?g6DScyjk1xFaEuenAPEn5=Vv9`WvXn?<&e5`1|0#R#U;0@2JK zr7PTsZ&T;PAw~4#p7;_EZ>W-c=+MrT5J=M+oVkS=&@3S!>6*XX<=|~FQ0nhohSty@ zd!ZDTO9(9J+joD9(R*F~5&~)ZwDTLiO%I+S!GA71Ido|^Ggdw-zVMvjcuLm&4O5@a z34>`MeoM#kLP_rfpJmIaku!)mDHsDx^s(j8;$x%Sg$RJdg!{rbZ zMc(e=u4=n0a1=^sU{NR<#dkr4^!K!T7z|wjTSCz&oVuILH@G?ruL!@dh2s=e>A1qY zVQ%NJvo+-q9E#q+KO@lDtkX6K>zj(7pjvRPU9obh?m$^&TzN>Up!L9K7+l6PbRppW37LMj7Woxd(4!Ow~Y?gtlaP-ZPqUAC7 z=WMaYpi-A8T?_x~yG($-%T!CM-BT!J*qe_?TekZ)hRJ#Wjk!aB@ ztnqXxcbJKpcf@bsFIw)uv_Mab?hP2k?}soQk;!W%FQVO9G?&4>lL9Lv(Xa}OWm3br zdvRcyui!kztn;+deX;_u*$!>g(V+m?8{4O@K5zsxgGWM3B>LRJk`+HI)z-UWX7*Rq zu%R!g?T?VY$@_(gon??5g-ixcRy8sngcls)VhE3;koJFle+tm|r+i7%tAz4lL*WIY z`9KJcW_FRMGuAtt${B)f64r1&hUuf|To9mgrFVmHZSz8a6N~i!$LFi`NV`FSrwmu( zhMoBH4KBx`nEvaVR)D@~6-Z_sc7?X?3)oY*sxo50|}1dvNa z&h^)wSTX&aaHT6b!Js#`S+OP<6Y|P$tmLe>Ljg8p|>tLYss@iarv`4#m*9Bdsf zC805ZzP*&Vy!8x>RPS#JUr`EPeoz4qbt)>6DK4E7yP5}UAzVU(V@LV8Q|O`z_0#$`X2IjuWlY#O9=2yrE=cuYp_SNzjMNpGBstSh9e|N zXmBP{g1b$tUEq_12Ht~9homz=Q>(uzjt-@fGtPf0IBE5d3Tu2GM{nG9@#&cqROyHAG3o7ejx_$6SLE+WmcK&?QuNghMB|Yxj?eu%%47MgA&< zFj_-o%7Q+IExtzFhB8`1B;ZC<8t(ENhk$|(WlAKF`bPm|dE+jN6)XNOh3Vh)#Ox&pN+}Hnw`Z8>R5j!Is%&x2q<1s=RYKg>m`!ny zUq{IOrul@5_)B?aHgM!OYdE>^j#Nik6n%lpAlUCA<~O>5c%^ct!S(NrSSR*1wEjkS z`f_$Qwz?Dwk0W*z=yW2mSj$}9X)ayUQB(aD=5(STiPWE+HrLymMXPfkT!HFNbOUwR zDz!@aB5iDwbpbjkaO{OL=9lC2RWO4ab_nGEATVh3qc-=pFw8XKfDr{I-qXGOu6`7@ znX(!t{Xw@WRsB}L%As^=V-PW_ko5o&x!d^8+U*3s2Z|OGxQP zr>eq?xh6?L(f7>q?i;AHEQS37=pr1^&Oj z+l)SnF>S?8(;Cw#9O)_+#Qa10-cBFAr@qy|V5&Qm{6jazTYa434CYP2V8psBSI{HZ zJcUpd`62X`HG^Qhxl)au8b8(3>$vU87|bIJuXLc-1s1B0YFc1Fg2uSFkHQNkdXRWe zZgc0$Rrwg~DHbib(f|Knw{{{w$Z5$2n3rH*F^?gi%?{)lg!~x3F?K4B^k;=AfU*DU z-E4A-POw({reWAZhCgiOps_B>u4 zAHVxNd7jQ^Ug!Ne`)AH<$P0ezMrPUOb@CP&C$OBmS0I`KAd@8pTr9R93p;$w7P%|{ z%69JJ!;ltpcPw$+VdS#_s2|d!^ayyAUXEGzO8CRfgkxBqCGv>0AgF~m-uGV(&nUqX zlMOkwVB8+o+Ee`mUFawb{#wKf<}mD}m*}?713Or5H4-97ZKR!>MSYf^$}5h=(A#A2 zF|;N+@f>GFH6yVy`1OKO2{X}1icUsqPy=V_p`pcdbxS{naLM8cI$HPfj$`hKA;Ey% z8#XLl_Zsm>4VF7=bYmrnW;zcmCNP7Zp-5$F923%I@R=TxMTU{JM&hJ>Qi3lKqh zs>0;%84tP?xhWnwjx3hPi}R&I!s&j{a%8VOUW10lo`n|MrI37rL2el&HmEOjN4g1y zqE*nqQdxQykyF4|B2OqZ7@O6tLR?S-ryK$=p+Pe5cRCVFBm|+s?@VbAQlo%xD1mv< zkoRs*XM!SLf`Oj+&KzCYiOfe090|Tw2$YK7OhEhy1QlK0jKvTNlA(yN5!zQsY`(2k zh_n+3K6DV)4|i@xB$V(3c77h)ar7o)hZ;D+5gql``dg$ua)e-@p)tg#$Uk7~NC{sK zXS5D;&#n88{2&;pJkYC8JnMHM8p?QaK|N?V8Bt`8cqkJZ5GAhN*x!jH5eVLOkPtsh zD@Ga!1mA6FsM`LGh48E3HH6S9A^cR8A7X|YI0fYDgG7#*!yP1;K#1;!2Hk9fFBmD$}zGSsI7b6Ab(*(4g5SXpZn|;L9P}01fMZtUrU85)6XqiLWu+ zx*pj>FwoH1HNo}LDtnx{3aOqsv#j%wDdVLM++~`i?&C| zWrK&vRxP{+4;r2>kTC5+QV0g#9+=gzn|lz_LNL%DLIdLSmWGIE6S5M8hHwGeC&Zdy z5JaoQi7R|Q5=Jo4Iw7GYSssFvXye@#NP>oEEe8XUuLJ{s8Z=D*Sh5IF*1;1DOK3>! z*s~3B)4_Yihn{Ejbv*>n%MuK9bXpQaxE~{R1OxQ~%t~^$xe`L3gU?DV78+z-*B2os z1Ov8q^}o9uiR>mA#L#u+!RJ4TNX{I*yR^43t3S7MuOlCb2DAljB$96+Gj#C;&m%}= zHfh{PR_a2pI139edKOu$>_tN&Q3Ge3=bVPb4Ap(@NHxL0rvVM?%kw?>!t$O$>;eP>%<^bXOND6_Vp<(}zT!}%XnLx}u2Z>`9JOT() zAFm;ZZYz{_?l48H2nO0NNYrgub^-~}$BR>ELqp=>$Z?e5v>-hP8q}+X7a~;z0t*wpDFcU* zAp$`wfW(s(ud)!GEqHNhG!)HYVo5ZhAzZXRp8|3KHE7?V6t$t@P#xPHaYYRr4NbKB9P?jKLE^UI-Q@{~MD*xB zJEVp{2%u+mRTpo?Aza>g4FU8d?xk69J7VaK&x(s5X0<3pBmnUv5L9%&aj2_OFi=OJM!998 zF>;P*h=vB&XQoS$MuLGp9~ykD6}k~YUxEf2q<&s+X^2?(;tPn~CZn>^l?&NVFc@XQ ztUhRqK0yiy1{xZRG6GT^k#3>}I@Bl~yE_oM9Rv+D-Yq;GcM@5H8aQ<&wi9ZY%-iUM zoFW*w(ftxh=8Q7rJ|QbET}T9`EnAO_?!XsN65U5=^;(jL%-xAM@S*e7hEI$Kh%eFb z6=tOz>zjjI-iddYFC7}xnmwJ6HUhyT1`VTkD^4O){O}t5=)5bI7F~%fBN({Rl7Aa| zAAlSt7=-&_R#iIBnvimWfu|lCwv2_yAwLKP?kUjlX^DsvqT!Dh=bHl!E|#+s5l?@7 zIp~|Afv0Zy5hRIVz-G}m$p;Q24MYPPGq_v5c#iPx!fVi8!>q14kDfuycHuPy_CbTX zQNc?jm`J!lLt@x|Hzbc>;6g)#0_)fvNEab12D++c@SOgR$Ohmwrl7>h2PY|rGr_=( z&WZ6eW?dz+(;xgOmCa$dui94PkWs=-qJI1zAQg z@T0ZcIsM)Ma(FksO3=Zj6inbUqhx=MBmCng*;57a3}jcNZa_wQvL7vXOkJq$JpZFvzDY!U2@98 zcje3ZYqL}%FrAGa;1ihOeOKjDJ1(z8M>B;!XwAMjw$0RSNM9-;6`hK~jXe{uG35V0 zKbIL#1sBzOg}#Q?4%J}34y}*R0vGxzFKzb~R{CK2zZb;c0oTb5O-@}lpHhpZ3C%$S zxWK(L|M96!@ZA#w_0!(L=%hzs6n#YgaDgoU-|uhAF+2bM5uIkf2NUwzgqU-KTU7qv zk8*<7!bkU92$wCvaB*QI3x2+n^rcP&e5vy+^T6`&7ZgwGV@G<-MSN)B$SlTY=gTY^ zEb+=FB#Fj#R^?W+XUwWHbnc}vu1~xvP`H}++V$A}Gw8we5pzVH4svMaW=vf>)euXp z`i-oGiJ#N+a!xh! z1=0WdGN~&0%cLC7M1N}P(Mk)^g_**bK7xQRmO3!a9(&s%-J@96gF46zKG3f&O0)|- zJi?15Uh6Hs!v{a!Mf$cW0zZqyG+^EqyDr#)9eULVSt|fCWm&D?L7CT$B~sLiFABg< zZv4krQ00YXpL{8hL{ADR^wHJGcR_%YzKn{1FQdvai^9y=c2jO)d1loijzV0+rtW!l zH$E6#!xF!ga*8_j|NM$70=}Xeu5#x`hueml@hb4NoyerNx&2mE-El1Q+~ndiVfe+B zhBCQ~14;;%`ZEg=5COMrQF28TS6ouY5~okR{!-#UzR!A=dCJr@K(q;suPF@G{m5ex zP`v;6XsaBv=|rd3XzH_Zt@p?up!MHha#cy49rFC*$PDaIp{<-kNdEs{c-ZH= zFa_J)Z{GuU_eryP_hq>T+m#=o|GEnGsCIzlebL99rBXl#&ofqJ?`AwA^G$cpy>1 z1RW|gPo1`d;h|3qx}UgD3e zsh_J>%4%^gxdy^q@Un=Bw`WiTV1{37(@ja3nf28_SFE-a#w<&lwnI$~#E5u|W&^Qw z)`C01CCA=A`8Q*6>yHTb?q*M20*(Mln_w6i#YT)YSO2Wu&RN?jbSnwtKwY_EXzg-|hT zASg2B+&VJ&oho#7Y|+TmDfh(0cFbu#M&yK6K<<~1Cb{{1i=KK^n%)UJZXP~DKUi)_ zz*rO-I*EooTW3Yqt65*^DJ>$on%xI=D+ z9x6E5KaKM2C98Mvzwn`HcqHvvJV?YC=$WdJl7t)yGfDUuw~}?wFUS17cbF$%|18*R7w-omnGviawy^%O%wK zzE}k1SQFz2dlcI0s+|c*PvZM^ueYyv8MmC=!qV2f`iQ8@ zbxYgc^`l%CSrHkour$;TTpY)9%nYa}y(rC(D8~}nF2nXRShFIa$VgbXhW3F)rV>URITmNqJ-Eq4+IFTwfi->3VByU6$3$?30tD|R zm|rC6O>6BcXiO_DslVOsWPL;dT=K)$=9R+`>s{B?Lc;V#UY?av;m>bo*}Qt8-5c-+ z<2co6q6@iLjl9n!&bXoe*kJW%%PCSlLGA@5Oro5=IK(8qZIeitSJY?f)tZ~XEmj^| zGh@Eni%ATv|FjXvJt_Ts0p)OG_6$#KWBl+z$GbgMFU${h%$)=w!H>p$+?$qSZ}^&= zkph0M4l0j~P`CN5BcZ62LK+Lyrx3nnI?7wC2lXd8w_hWdGR2c=lfY!XUq2SdLlKC-Vm`l;SgJt_yJpKan;$RnP_xC zZ$0xVpZEj*-P3`Eh3_sj2?$oK(fFr;=dOu94i3<1bnFc`TXZ{Yh$t9i54pF$Ow>t! z?rUFq==F2iqF!plV?inDE+RGutPG(34bFC9qX_5dryVpEhudj0wkCE;-xIy$j)9yC zRYdoq^uN#YrdP~}%n~Y!D3X|;s+aIia83|v7o<+Q` z)~3!|b3=F$Le$ef4?*oQ)2EXl#@#H>dH<{3tnuK*FB+0(R85GS$R@}g=x(Sbb9tAN zYJ(Ye6c3gO&8aV5u$c(bcp!Lu$QT>$xQhAF`ZMLE(}x$+;^yorzhVM*9bp46{j)u&Ox$&s|yVe82=_hdgVh$^(-U^xmp2)?7ybs$z0zIPjo?C1sc zU-A66O%|-WytJw%V&Kksx5O)U&IG3#ctP47C^+!U zs*J?3DDl&+&!=Ahbog;v@5qmsIb%dn5Z&o`wa}oFR6rGPw^t=<0;P=k-8_4BlpYZ= z>90_)t7-315~lt2+wsSx1|DBfpAFs*pZ<%;@peG$>UH@l5~dpP(Dw8D7`@Oa@hS7WipQ5}PIqB|eg|&;cwiOI z!9e^EQshK*2X2iCNw|!ZX!&g2Ru@aE7QRf#4M)9q=WyfL{>@dhn~xS$=dRgCd!QW9 zPxO-SD8%dze}9EyxM7s*I@K^JGq71yt$BLmbY&ual9Mt zn27deS)RXYf=@qB2PfnB&cX|(8*t~oYaO`}xOyVLmhrR;%IV49>+l&Qo%wN{hM3E$ zgRpQwA6G3;S9V=leLD5LiCvDr@*f18kmB`tXb^n1^}Ye>CXTzObS%TeTkb`|pIZ0k z;a6aE<2eRc55b)a%$xCK?rkBQ9D4H7NsrWB=ynjCX1*CcRl%*((&?wG z7Wi*Ta+YenB&KYtLDb_BhS+(%{a7%F^K;y*yl1T+4s?D4qZ?nL!e|Tf2CZ32@^fl3cl<(`%WaekPN4xV z=EPG?3ii9moOYLRSAPUI~t7uc|w0sjh%vB@#H z)b}wPkLJD&E?Z9rpOpL~PxO*;9by^zPXC;$T(!I`_9bG(cZEt8ODXVAjvx`lUYp5k zIG94NmK!}q%#2H$9vm2rz9|27+4w5PnO*n{pdkOnMbF6G%hINemC2hA_U>4_;>YP* z+a}A0jz6J|5CoUWxX9qZt|w|upJ(lvVc~f`)I6z~=qMemGT?1yKSd9a+F|*jY$XZf zjYI3CioOrm@kA3b>>2KLQsrC7@u&Z*s#wp5=_hS%p0X|_WnY~16AJO%gMS&fEjEzd zOuRj^^0~m1YgJ0ieSSHz&-+=qob9Y{Af!anJW-_=;T%TAph%bQHp{h zF9_oZ;}3gJhM$)3eKJ_fRyH~C)j#HJM%(WY)4!p_iV?XFD<&{%3whpMI23)n>#M{b z$))$ww|q`lC1SJU(eYP#cgq>9j3kCn%Hj7{t&?#bf{;j^%)xwxCy4w z?eb?aqq{dZZTlRQAzrkV$Wh%PSFb3FZ4p6^1qKZaK%X^_vM!9CRDCwKePdhrR6h*l z^lV9A2sZBCAb~nM8D{w@2GPG6I)7S|xc}pAp~GMR;2VMmoV8LYVLJzVN!ZNkC$F_y zNXXRju|D;zf4_a)PmUaRzr~k}9Y4tRlHxJ1u&ci+}8ALrgdO1PKaMNEh zm+jZz8P5`2{3)}`*xgk$d4fZ`3WawXbd)##6*du0mQS0@>(7Z?L9H3eJCrJp9P6Fn z;PDi(7x1rMSNdJDUdIk;zari0l}~aiqWyOD-6e7iYsifr{O(`N0(}?10(NHIe9;@R zW%s+9Cv#t9$$-rre1$U5)BbA}U;Ysce}9|j$C+O96Ib+}=xI-1k8zwCl(q#5YN%C_ z!%qq;{ILXR#5&(R{}Vo|cC9ib3iA6y&@_DCKk?vYm03xjmh7!iNZTf`rKs%{k;7io z`Cz}(H*(FiK9#LIHgCh;3%8==c0RRZk>-l&XrRn1>xo+ucBj3CoSB_67PsOCJXS@8^XP+OJVAT*oMiLbKa?Xj5 zRKVGt;v*VXpKAKoC(e5}X!8NXI0fW81Th=uQYr~!oYh@FU*w*~s+NU&N~53i5!D1> z{7<30e;sj-?B~mwzh?dptf(qpv{Gqp-(4RfDCh*a>oKQz$lS2V@gp1WM1;*8JaFXY z2Cs3B<0oAjatD4;K8|xhe|!aepEnq5vRbK*f8FJ8X(EB(oB?(;4#;SSU`T8009o+c zm!Rq$#yghx*WP@#^LxfSqN5B1av%0t{IeH!`m0X}?-o`F#m()M`qNz3ZX$@?dB&=+zQ?d; zd?2wnYc8f|`sT49syE5GUi}pCX{K1MguX)Gx#N?S2 zGuag+Zq@!}&aSs?zwVJ!RZB3^wjpBNX!rE+S!qMAl{_t4%Ig?PQq?`9S6)T)pMw5} z*TWu$cM*%VB>39wuA3;HEf+fes#3nHk-^&rzZ5S-zR_;jUnTO*%lHdXkhu*CzPk8i7MTn8I=1v; ztimzgfV&q;0%u~~Y(kJ5DRn!!mu_Er(k7r0olBA_{V&fk@l6 znmDpxwA4?%JM7;}qEbVDD+y;Xi5yh~3U>EC|7RyN*}MJb45j&7*it>= zDHV-fD|cFvSF$-~ig!Isil4o7oa23db^~@rX9B|tIL}EG+X0;%MvFw>-7A|P@$-|J z#DyumPnE~rWT6oqh&_)$KlMkdyvXIdcxtKA+j8UkTfbZiYuDJ%M=T#V2ra>dne+ai zP;OE$Xxkg%@_8M@ej=GcmXDun6S3KW5bLl%&6-By=00?380>wM_;Tt+bE6rq;M5J@ zKk4Xjk6IbhO2WkVt6lGyi+Dcjezh;^;KP*|W~&2bC=~7*_*bWI5w?GZU;o}3xXoPi z+lTk_jYuCuEB0R^C;-MW*vItPxr$sZcO>0hxaxA$+V+0+*kds>mc*gs-9zgo*-tA? zJ=W1PV;iUkhfgP`xqFX~KaQi=8y`E4t@`JRK;O0_St+vdRPOp!$=ac;;fG4R(dDI0Hf4#sx{*5<{NZE_Q>$HEo| z=aew5fr}Xr@&kVEl=>DQOq8Rdtq?s&cgX~YVe8%&W_PkFk=;?LhN>5{Uz0GfR)A}; z0)HCGjaO~@&?vG%F(IUs6`XHf@-&D9qP^@+^)B*B05wTy|Ir;PdSfaf+?Rfb@)I%s zUr*FKJ(0gKIz#u`S03m z+W)+Z2FK%DfqM_sE7odTO~QibozUEU&1IRg(TdUh>mlH>4<2KvLu@|dI}Kn!A2%AR zU!3Zx7xvA+{c>gLj@5R&L~tf(7O?-az)y*+w|+`sn|Pso=&XyzNbL%+JBQcfj)9mH zEuB0T<_q5*Wqlpg?Z3&p_I1ROA~2QUIeG--OdJucx8U5&+v^j!E#zvljq`l5-Xpg@ zlDM6aySF$N+eMk|oc4#kEEcXCI5quY=(TyRb+r%!_aAY3CpWr_!dLhZ+eN|Y{q2f2 zZqc@>n){Mjl%yc=jHpLN+px9r$Um`Qs`5qix+&?~2Htw@yL7B+1(6d3a|WpYRo}GP zr22FfkI3C9-DHt|dSgM_^al%w93Q$eJkw2(CSkK(9=pYw1P4dmk@L>v$vyWS60=CI8D#xlPU1o!$G<~*3rWt>fa`I%tMz-i zC-;*_MD$2~le!OLr$qPlkT9Kw=>uLu)y3aw=?yB#HPSrI$3idJgHNkqarI| zZSY)Y+jsGCH$mUQrZNd>30L-tkERcDGmTyCr}q;%!6}fNzqvVwtoNE>?4Wz#r;L33 zNdf02uR-5{jmOawv4LEIel>QTak6+cC6DZ{J3XveY5SjlT3K-P29aafLvEGc`I}_D zlA#{QH2Z^v-a6&ELDl-57{?hy{Be-uQfeF=FCV9P&UP#0z3&{ToN08)?tOXtQPq+<8uvqoQ73a?vy=d1)@G7fG`(bf&VpKfjl% zIRbhTe$J(ZK{=XxIu^N1mM+NTb{l=oL1)Uf3$ywb$zC90*te8~7$0>>a>0#;rEBwi zTwUULOiSNcNKbl+jz5M5l-s_Uft^iF$}L=OSE}3pWS7MQrtalXIP|PQFV1LrOpWe!d`b+76Hlsc*&ZUYV5JG-JwT zR?pOXYb4%vo6e&?lOl3KjgSkqTHi(1>*I5XHZ6{lm@$xiY5j&HAlApvxjZ(Ii?n;I zO6C$It$lW7^h3q^dZLjSksSP-kOxt*&2TILczsz zTV`0^FsM6pj>u8b>hwtcDnc$^mxp_JR_Og34Z)c!-28n=y@l=z^{&6lSb*oi{ePmA z>XL%C!M46L#?Rj`dM@;B8?k(}HV7(3Zy`qnB4RU7Y?F>MvZ&u&f9O<=DG{SKLrne9 zm%n&DDEDXk`|UL!E+2mU`o;p5`pKE&lQm~?;8_eoPi@glr23pER(q^ANbJ$yJ6Qp< zEChEE^{}r*J&)=p2RweV1rgWFUHL!1JAT*fj16&R2lqcSq1?OC(~HS|9t&_AYmk{A zA|J9ZW~`}nl&B}X6mmNwJ1AtX@1OWFNx`gwciI(`d}rTtIhF*z2e)v0LlZvOUsLGn{n_{8FX z^vhDB2lew1?|?pH@#x>7T=L)423kPpMY}6Wej2_OS5Qd0<8F09 z``(uOv0g-sx*zH#=-ypO!UXsHuD>={vFdw)b^P^iD;5}~`0@#UgPg+iyO+uJ`TeuA zXOWdt8`qCy@$JH^NP0AMEm|w?IYQF&+j(Q*j?SmXFLzfzSGj!{J?Wb~=cBRsp0!DE5&fj=LGEp412*a6xEd|fhkixgjh|HMBPO42 zfba%iJ{|+eUHpC10xKWr7MxY=R{P%Ce#f$-h!!>Xhg^&uk>Q3F_ zFdfShnVzSiKMd1Bgo@XrCqqm#_;wlz+w<{depowJa(RW4MOCoZy-1QOjS+KyqIMMcyPVsFg6$XgNyF&(CkXF3CBxap)RS8kujQG?|N zKRVbF0k6(k&5e-c^fjlxIy%j%)yAakc!I_MIIwD_Y2g-`BN{^jYpms;sc#^H0%xG$or?J$@7^b*IyiqD z{B|&GKMu$<2MWGU4LwE{>`G(*NHur)7Pmn6*ZgMzH;In&fc^^J`s{R(sxVRjM_h+`57aZv5d$Gpr`Fi^Hvy> z8Zd}kOp^9fUrWvO&dD9`=e;Ak$zXv19ehkeQs5m~uXoq9UXP&cn&q;y6d%m%b0UH? z8st>t5iFXRoaUEunWs9qzL}~%yygwpK7$UTn>2LsdoHHK`2;fPfASzB5EZ=J#_Q*( zD|;%jxme)*%hQjEdOT>gRpcd^tF}=OR3A5dCK=Cwr$;urZfJmL@bt4x2e3{bwSa57MLEv zk0GTuk;%vED=pDO5my`Pl_!N3L?c?u>^cT)P3*Q8QKoR^H`CJp}eaSAb>c1Vw(tlDB!DZBK zOfBBFk2(!yXd=Bb2id+1yv}p^Z{*GDpS{?TGs2K_%fNd#T_oGyX?}6X5-<63vd!NW z7g=|E!6Ph(%@#-zIG7o+(czxt<2Wtn4%1-3}JJrLWy|BZ+_|tg8hi5(&>XHth(R6xV6LM}P=%D=lW%2dmk=ViOGmw#$ z)ORX-7aTq=d=X6R;77mW!^z=BsLN}OSI%I10zX>!0=E5PIpn7!RY#>uSh?$GA$l$d zzN6>IMc2~<(< zsx|(X_orhyD+RFq%;k{XPSh3^Z@uef*?*>B2EH4dTuOXuSYKa$$imX|T-jabhDeAr zwS_tVW2=iN_VI5D!*c*xwi;w_@6NqYFl{|{w6_vF*g_sTx|$lqOpMRwtvDQx8t6Aw z*cldb%>1kwo3#%-!46L5W>;E(?;7$6gzu>ez>Yh=g57W7fJCpMW~ki$BOjJu?2H{O zJ@HD|n^nD+I!-JfuT-@$c9ud}uhfeSAt_(2?4; zpwqp-uTWxuEXIz!c%Qv-i9>P7I_g?3+JTbjI`AQgspyyYSXuey$|~#H-pGaJUfldZ z?*wtVVQhmL>|VAX-lI;qMAPmSmSj{Ht>|s?ef6+KKbXS_;ofP;72W>*&%WQ8e3jD7 ztuePe@NlZx{jsC>3=U0F)YkK@_8B;Y1x-G zNm{G7l*{4T>iicZ!I5G&IPdPffBS>1p2rZ8EhE5rV(b&CB37=GW6#};yD=#lv-hx2o!;Nv{OP?pNv<^xA8vcoNjyhWlS>TP4;Au*(usyW30xpIJnErM9A8&^3_ z4)i||bHDgp+pD(namG`nJLeX6nx7{+N;iNYZQHJUr21S?W}Z;=Ua)s~KyOd?4vp7P9W?*%%V&3PJm^1(+VL9g?TB;_cl>muz1d zlzyWBG3jiQiY@`~`;TJnj^m!TRrqEzmM@6=`>47iZ7-OGIQ5B+KgKU8IKA})c6Z5S z11hG;czAs}+o3*GZx~YExnh!o0JdW|J&CmwSD|QqA^|ChhR=(W-xZ%?{4oAILgc7l zAZ^&D1ZF{~KdC2FtX8p4P4IitJRH_z{o zzcy4%~rb`5{@SDZ*xQSKlS-+cKvAT zlg3o$n%2AnMw(xV91XM!cw8!M6uawfvUvW*GJ+0qDq?M?3VkBhhkz3{bo_C){=`Nh zSCN;G-4%^%zmMYFOQ@By$DZ4L;9lzTdOuN*(FD2L0_R?Gy_~gwvU8|7P0iI#_05UQ z>YGGP;4mD2lmtC4%u$?R)}s$@YSGcvn_~9O8x5%eXMgw!ln0Ge@*EQNNdv;l>Xv59 zg@&*EKQ(nse8*CWdVIssPiC$K?%W)j1OyFQC}J8*rFntfXDSH2gyf1<1Hllu2^BsX`O?b4U9UFQ7fl{V|^LocsHqMz7v zLH1c~*iF2+YPo;@-0XG@VdG#*YF)at9atst{Y4m^m_mxSd?e{%>mi z`P$+MI1HAbcONWY$p=&HdJ9f3`p@e2y#Ug8 z^W4DoOWZeskIaFd3tNdC&nL)zoB7RwJpPOxc*q>09C@4^=W|lyZ0v5gCz%S`#xkDFje2Uevv@N#`O(zNpp(jG( z!KOhZKX>ZY7V2%^U(Pk!akui5Hz|hXfsq*HzD(0Jyr1ZGua^gmTJ;v(mR#b=@cH_e z`Ge>v_A=@XS}FeogE0y*W9=^SZWca&O1rq^w-Gt)am5%7iZaPhLBDT1w%>D$EiG$X z%hE154z`Q%!-$H8ON<5a*fc*meLCJ;d;QUhxrkSYYPEZWY6uadRl)K_*?VHE(InvM_c{CDB&1x5vL?h1rhb)0{d@m(z4Xr1)<>cHuq zH1u@x1Eb_IsdzG-pS-p7tL0W-|704Hb)cN+rce%a6P!pYpcre?Pa&R?X>Wcj4bSB( zxph-?00d+BTA_W1+`!6vF(kR=I``|OuB6hd72`MXXvAN@FpigWH;8$y*iXI`Kj&J6 z!4h)?*0S8>7OlMU1^0-Yaz5nVzA;}+l2h-mSZ@~BCG7b1jiJw#ktHNARUsyl=_ib0 zxIXG`Z$W%|%#E~Pw*e}D8&BN?I| z<1f@R`J3BM)*IUta%2W#zfj5L=y9pgP!KxcS1{Qz$Vr};Hvh-bw{8m}&#mMwwz-mu zXx{(ujR<1z)~9XQeQRR>mC3f(uwiZvR52d42gL$EMurSKM&m5=#p&%uY(>x_;76AZ zX3x^x##Cu~#B(dD5KW_f$YF2x0CSY7>ucOArT*T`Xc0B~lcHqajR#fOW$DfNS z+Gg1Al?GQWkT{^rZqdzWR%kpcaFjPj(`YTx>@YnCCNr)jcOMf3aNtKzsbN0^X~yrY zc^f~Evw~7=5&g5wB7=3Cj(pI^j=SK=PSJN@wx2D{oO%ykY`_Q2=m5#r_@NxmG%R6C7|~} zUYei1)!;01?RRPF21TsN=#34V;} zGHmPlXH_<4rBTy##+!Deo1=5qw?jVB@bLh8EInPE-7-I1rM5PMqToCgODigyIJRl` znHzo?8_{&e7aO*{p}p$a(bAo~JU^LOqO2$9;6xgq-qmU6UtpPdTxFjzlw+z7L^PE5 z^`dFCHe+_4p@T}$g{PhcF{dz|t80SayCL<^%)8Q9y7#)mAw%#&%V=KvziC$DSYqGF zIOBKBs#DdAtBUtvNg5u7EykcLl^)INS}80 zA`?TVy-ODJ?TJV%?NS@t&t#iQ#-o>O6ZOr|G`jSJN9QxCs&Ok$`e4Uq2e9i+!dHvj zIFZ<$i7vzxdPy6{`wO$Y?nrvqbYRD3DNm%^O3#o~K0X7>J9*+8cNgq;n|GfVuf&eO zyo_zVFrWEqB-WU#4_#cqhJz@(f1v}D*R6ld0(&0~cp=S7_I%TDX62&_mu9{!jFtJp z&NDS+zHmAB$~waZOQVUg-g{GoSpOVmH>6tUw^@}WM z`Sq)j{M0kkusyf@-80ljfs-qwlXB^Y4iq6bk|)5I+~vzzPKdgB5)@$Y5M# zZ*Il%51*&*SN!-W?acU8$O&MmV7Cd}53}({Fv(8`59>^Eh2CS(Y zbOzAeSd~iRe3oWt3fAt~pqrzqpTlbn#sI!ruzT39+WI?_-5hEQ{^j?wKRWDM_fMAX z)$t{XvjWnziTMDci~CAaG=!Y> z-l%_Wc#NvKxs;K$pi)^zNBG!a3YhN*t@jvmsv+z4lk|etUreht(tq>PwlKmoa;#-i z4y}J|%PliEbsf1nqpEWs+Mcl%>6YH`qvsR<_{jsOTCiJ4y>_Z&C!3Su%l=J5%bz}I z=yx>OY%Fy_#$r+rIw(8`{uNx4-b6mKAiHO^7Ss-X6v2eQoiv9gQ1?z}< zGzVC|CAazm$a?wC-g;8AVx8;b{0nu?E(3EVzV)Wvf?TB3TyogDqor`_?GD$3VtcpO zte~5NV2Q$yBJ90Qk5(@v@3e|(R~I6Gw)pHxwm6xYt4k$fY9FCoxaDT-HjK%^Ah+g7 zZ)D6U^1#`5w~6zPR|Jejp=&_yj<}*Vu3BKNh#bf~>wG7$^}S8R?~Of9w+S2t+n}A6 zJ|BA;eNv8Jv+#Vy?Y*!Fde9Nq*-J9=509sVblapal-9doJVi3ym4tQ zV{3N*y78R}POH;@L-4EwuNk=&T1GF&Tyog@yyuf`uDYLl879bC8R+N+-{?dw(UC{b8Av7ktKse&{VCf;2Sl@aO)GogCr72-{6dSL>f-$wvJclcMn0lS)W~ zjz$_ijwU;r;4}2_!`#-(x*J9!1H06QA%{EXS4)JT=SUXTuP19%-gKv_p6D#uQ1it3 z5i>4>FdE;@umbMf_v@dX!MjYazLoMDtZZ7u`b74cO(XhA1H%}sKl~N!KV(N^_yQB; z3b?-J&Kq*f*XjZD2|@521T%(f{t)ynBH z4D`gt)$(f~xqRjMyXRirzrxXcUJ&aqHm~~r zfh5=QV2R@=_F1#d%4f;*;PTfa4_NlAt_(lgdG15q7iTcwCMyPPMWXl3XyN}G3PCs)}>x6F+SLj^3&C8ap zB{}*AU@XdN<&W4Cqc~3=E}yY(%i_z{ziTWmm&J*VN7oY-dJqb39F3rmDu&DKmFWDB z(O35vZaZINP*+LRlRXQuyAKK)a2RNRIg#az#fP|FDu@+%7rZMtkd{s4GG9QhW8gj( zMdI9iT>UaeE&Z@m8zYl%ohawRG{;Q_$eTjB7T%?Y(}Qw*$^&RI$y38MrXQHjx^blu z)E~ax1(YGzcR+hBiBl03tMi^7?>r}?q-e&?*P=v>{ug5Pc3%H<&z!kT+7I=v=htf% zSqxn31@rTy9Pp9f3xbV&(=|~&T>02vdcvBs(vJR$xw3Uzat~>XoerW=ur2lT*iSN7 zSHE&mZ|jSWqyw2P&c;s+@q(aVzl7XY{jI8i1NxKW&uYge|0GTR(+a9rZ`N5@OJW>n zC8NHE+)%L64^q9%>Rsx2R5DXVn@zE>u4{HA%F)pAP}NX%kA!WIpw9lpTDZYyW3#-C zSb4<)q8#=DLL{*5pW;QTKV7usXvA<}w%_UQmC|)YJw9~9B7XW!F_NCjld$w17LT5; zHco!L>Q>%#6k|=?)k#CArSy$s;7R}}=VYyHd15D*eNnsXXqA?T1CKxG9h1#Rp-?+v zt&EwyID}%j)@$itNNMDl2G0@rt3NMMDvVgX6C`N)Cy=8&yZuiTQdQVyb))CVk=14? z`RlI*TNCxL_mOoD@?0kS`LJYm#R6r~tbpe#tzWaEUl9cvsGkRI)??4jAr^^#KmxY1{OADQo*-mpeK?mkg(3z)pY^=$vu z|ID64-apC=SWlZb9!WmV)Aq9ZE3tq)J0Q4b#NC`MICO5wlV=rfjPjPx5xScWsS^e1 z=8*gC>@VxQ8Gbo}%L8lL zH8ZI`n!hsuEnv$Tj(1Kw(62#m;f(9A$<;DeDeoIkv%adP{B_M-Gc{8Camhi> zLHKMt!A+K&$hHJec7jynvbOjr`Y*X`(9U>0>@^u;fBUcto0HYK+Hd5SOu@^%2u*B{N2EtO@FX3MT-?BRJA#nL04HS#1ta8F(2L4u!hA~t&S zHKsVskB@J9XDe0CbDQX<05}^2-xm~ERzt3q!y2dWcE${8B_3{k5ht3KN90({Uel3rV=IW5 zAXsF;H4^v8f^j#&`Zqp(vY#!EIb{*L@s?WJ!KT3wkUyar!clP1SzmJbnzo*vdaHdT ze^}vN{Mo5C>VzaI=+X}oR>OgxhHJ`gaC#59{&9)W=;;VJRhE|6gYQg zpQx?G+>&U$Mk2;QhwRat$M~^#9Zq&?*?g~k_tLLkXkD21u347n+&glIyBR>iUF< z9Q_333Yq$XWW9JTn`JMrtADDitmMvcl9eQK3^W80^BlzVaNVU!_I0GXcBySm)U+nOUw4;Py?2#z=b8`0O2wts*{0)UP>yA zx8vq_B8R=1cEF*DJQ$RtQ+yjDJE&j1eTD^NoW2n;(Nrk6aog-gB)KV~A5WNNd>Y^` ztS;?~+m3Y>*2KcjTM0Qy^Jwf2%*i>)U2*G4ii2reN6tlg$@a@mhb2K1Sk#AZI0g zXErK_YrBlRFSk+#tbAqbHhhjuQBNjvJkuZ-FuOpW$bn}~uP--jYJbwPyZZb(#~WYF zEHRLC7LC2H*EyI*zJ_Bn?-}3xdt$!|o*mkQtmykd)Vq2d>J=VXM_#{nD%V^W^JrCJ z-ptxP%jr1l5Rv1(1Gxd;T_&XJT-;D2w#sb93OQeAm(nG>+=&`o4}P2{0QRyXaqS?o4x82w=mG^=BuC78;!UPEflKi2dMLB|QUnE>HGQ{`gZdw4Nwr-*fQ& zMp-L!Q`6IE7o*S%ToC?7kmu4*&vSoUgFp)Ad2I&b-3ai#vdh=%`hvy-KgJhPB(V{E zT~qAqJs#(BaN-FQX&RuYVA(l3P{-ky}U2~DSVnNFnVg|;8;dmD+S(-lrkq~{+~|KNGG9qD<&wMO+> zds(tLuM!CB!H*$%ZQ`iWD?6Lk%|!!C3jJp_V$=*O&7wPH>8`vt*um#NBZ6oza_56s-*%(R1BLeP4Z{DDOK$c2 z7xRV0(_f=U(z+&|KxKdX(7x{QUfW z^mqo3)c?vl^LQ%OKaS5?Id+Pp&_ZaTvQ{K?EBbZ9B`PUPkrGKoicXfJMYO1UvQ0DF%WM>$ldi8RyKf=**ITr)dC4HQGq|! z*7ZWSMw+UW$-lw=r$q2$?BO4|`x|LTY0`^lq-56~AzBS9X@PL)EfDe>da?4eDzSTo zo%vko_>T5ov+I914m~?KNboYho=bcERh@bCnAK?2T#nAwZGvC&)Gbaa^y6yaXR|!t z3PYPgD|Zg|@hO>1^au9&7-4oZsGI2i;*q|kCy6t+stSjiLEYrnWw-k;+)0S38w)SJ z2d;iQ#4xh^kwKh!&t5pWg%-LbhPUXiC3^TVW+!v3RO`L-`02(ohVbLGU3R~Y?>Uve zYsN=a;u^DW2-8|<+e}-!6{XKD8?CZIlV2ydspYhU&%zhd;8Vx5$B%FET;yXogSbc% zCKPL>O*5s{h1mt%#FZJ<@o;+d!k6X6^RdTjGEpimRo;gHV28lmGR2cmE1u@VdL|^OF~t}wuqMN&lNmc9`kIT zQsu;5pxjRl%QJ|TT<61Po_;+alG?wEB`FoJreaJE9(!keZBIrxyVBXuN2Ja+#q9kd zIr!s&GL@r`Kso(7cQkBJan%f)YhoQyG^l#Pzs+fM#WgmIvw%E!|DIeDk+LVk1`zv! z?B4~!<3Hwhc4xD>>zKpVisuNuF%Scl0=85XHM!$vlH!fXv=^E;b|jrMOkeDHbJN7v zR6E7NOp9TGrjyZHP`Ez)_w2g++}r_uzIeNB$Y`80rl$mAPH>apmJSOkmYs3d=|P8X zabm6K*S?#!fkl;L;!W+W&D-BzEK@DNmn$*PTP3tSO03F_XHVjQ{}>w|2MTH}h`hyk ztuKsjG_Mur9KNBprqL;PzXi2eSlghP_3D$#&|+yb+td(Rc)h*$Zeh6FqKma8JwS*o zf!vXz_wZSFpg*qXZBTR1yFKuxxs;ge^4-p{h#ubSg3M*nrG-}D>g*oTf_MXm=w2@u zQL=kLh;0t#`DL9Lzt5C$ZQ5*wd#0AM(o{Q%j|03&sHj5y`{Jo&`?;Op z{`1%Jxpqq zFBOx(XI=M(5z3BU_@2i_ZJ&PD?YwsJ>VZ!CcMaW}32v-6NaMk#LWR-{#J#C+zUK!F zoXmgb{3_PItosaAP9z^%$(#Q6w`A3gf8Pz)9cy1{Dl%N2&sQ$~L70w{Unr~$@*(>N z+P{_<1nvHE`E7T^V3;$vo*mS=(9=Yr*f_ z{967p`yp9(GCUY@(CbS=go1>I>US?q!PkzOV5*+fBZxUV*rPWE)#$T(|C^b{ihRFJ zH_FYWhUy**jBlX)=T1!%AaYLGGIGtFa37Cn>Gr0baM?q#67LY~Qyq#3=KH`l%Jfd3 z+$nw8V`^Q=qoq04kLYdCN*``g9~p!FZ{~jNU)`mWsy5Z?mZ?#HT%*c~f{Y7>DGQQ) zaE{bkA`L?StM|SZeDs~utH~=Ik)VLN2y&L|1i$4Hx+-e)TE*-YlDO;A_{w`zsd|i8 zkbB&pwhq<1Eu|`-I}%h=R{pTJ>hlU0gu`Q(1Gb?-D3`FTYKNA-WTCmgw1)H-H+6ShDxi4Fa8H*IPTZkG=?O{N9%= z?%v0F+~2ntEqgj+R@og#qa#gSH3Rg~>F-y&J_hvy%R8bGJ>MdypBbCO+HWXcaoxmT zIGQaP!)OyBR>F5{CbB`}#j;aLg6{FCy5LF5;6a|8Ack5h3Yn1eO@8@X;!SBjPQnE#Zs1w@^WL zBm^xFG9*#()60Z4CF=Wro;Ix0lS^hir*dNQkehjT#dVZ>v8T;RA&i^((&*@DgdX)em^o|TF7631EtAWI83wr{#l4=0ne@$~ z$7>!3G3buzxxvd{Bda5^jS%C9?3u5O>ZQyVWcum|_7>56pS80V8X2Hz#+0A{WJtiP2`D)m(*ao#5_XJ8M3WbdldAZKR5;H@*+-^VzohK`AZ$|hP-&*KkcByk?mxxhuqWt zDg9r{q<%W_0lUr1V}cN33><^DWq~=AqC^%z`x@mD()5& zuIIS?tbbMzm1CcWTzBzR9>T4SF-&=0=IoqxOV++Z{6Pv8lQf1HH=`H4PXzo!GE*>9 zxuy4;Q~0++!_XIT_LGtLlhX%5D@FPq6pS-__vx&Qa-arp(8tBDGn^_&d~o*p84EUQ zr?uhBrE*X9weRC%IXO&V7r9tO4Pg9!5q?A2&#kn+fZGx{TYWh-$^umb|>} z6CT7)j6@O}N}iAlNpSydDHngOw?4A5FOesI;g7SzfAJOdcsS3XK~81qtDm@Hy@#?$k1n71V0vKaaHvAc!$+n|_(`9(JMQMx!YmTXx zn^#Jo*fzRM-7f=A$5dL|;7_^?Cz}Y-#^+7!K07V?nrNVJfZW!n344oy+-j@RDOO)0 ufGK3-1HEUe;zEiZFtl!P9kY&>k3FK@u`v}jI)&T$i@VhT@y&i}2mcRJFT)rB delta 5885 zcmZu#30zI-`@iow=N?;$A>AS)6({0~Pw)Q9hGk@QHTW>T)Ha!aW@q3l?c#a2#vXicV-pW-V#7^M z!nlvUk*~Bj@T2yjyjxQb9@Es6Vf%4S#(kO<^HvT zos4|1(=cvy_RQGo+>G&SEsFWsmPQ`vV&q$00(i|F&w=M-OC)$JXn@M&1uw zuM@r0DLuY>^UseQ#;Ji6Jx-0M*5PU>Z3tIQ)H^~g);j&5dNW!$UPatbJT$u>)n-f^ zI6?i6@vR+``512_KZ>W7PdvSttQu*^6g8e->{LmeOdw)9o4BoCF|XAno*(UEqGL1E z0O}U0+R}tb)u@$4sx=wao`pCsX2CJv+M}4pMj>|hXf>Ia`sdK2IjRSBnyXgQka?=F zV!0~jK8@?BI*{d;vVjJDDSOZ>K~4S&u=y+5NcLZY>L(!KYe+4Jfbtt6+tA!0vMpr} zkq=VbH(>QcA?Pp^7Wyu#fh>ce93BkzWH1D-Ay5tpfnGrf+Bysa93BRhgljR>A!kz?lBFo$aSoxPodyT94@eWqAO_zn8n{F45B9PAxic&)jTVCHq-R=?To z=xTY2jd(l88uF^;)tH|8qfPqG2%Dul!)u?Is?&K`=ydET&%HB^e{t8uZ{9WVhNT{S zQmKh6Wp>=FY=1_bd)F9O$~}1BauY8pcjvwpz4_XTVZ7l31Mi7v(gRz*`GH49`GYSd zKJ<|X-}K1HmB(9n?&F92#9zf3zdac*@t)5NJocFfzwj)S_kBK7r8hDc`4<1=%%qXeC0&n;lAzmB#rq@e&pEtHV@{N&~yfGv=vCxDyEPxs? z7D$sA^Pmfi8Ay>p^_5tFp{APIrcV!tE#_X!v-!IP>3c|TOXCjd4YWqUi9>oLwawL= z=r;j<^UxNVr}v;d0TzeRmM1ZjHcn2@tpZne=CC!nx4*uvR*8%n5y|hI+-L{b9DQON|6`H{k0<|tyQes_D`2wES zg@Z0upw?MowVIbx^5*vawF3*4F_PBVj`bhS$|!a=v!m?U%!bNmBW3$27D@?GU`wKy zCpkx>IN<_LMnn24ni*;G99B%D<}wpK0cdOIv7L-Y{S2MMKf`#?0+h}*h9y&ZjBvOR zFiJq`LP(t#!Na^o%%Ej1Vzn3*#-cH3F{VQ5VwOYm;^5YL3AFu}fGSu5?GEvPQ~{Pt zF<#co5Gi;W%nAhbwTEEe;wN+QJ}Ye8eQ_%PofI^u5(JMfNxn+AWlz${?~UxF^M}Qvc%08dtv0V);oG^g%xt6dYeUO^XWn%EcXp6|J%YjLa};$? zIm&FQo;9ScITN7%{dR3Z7#s�v=1z5ru1q5y4=3)q3KC+(LwHh;C{uGvO6 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 COOKZT diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index a67c83e22601310e39e6fbf051c792d1031f2316..4faca3862268cf0cbebdbd37dcf66abc6de495c7 100644 GIT binary patch delta 72723 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

bdaE^SZZ%GvulhC7$2J(Mnz3*btj|e?z zFqK?WAg5dRV|&gvukc$f&&TXHjthY_7mucbM+Cz%K|Dy~vX~1qg#Q#Li<2yO&-EDR zG&tp_Sle+!N`%2hcSP53z}XcHGra{KjPxa8elLOEd4o{#;dJr|WknxEXCa&}NNMLiRKL&2{VGUv zuiZ~IHdh0H$Tb|TYsi<=!3AsL#|T_6vHJ_KH!@0VX`5@u>z8N#Sfo}UUHsZHZB=$ z88!aPcbwm?P3b`4YeKXrDDzT(o`cf9TK=&2&w4-3)bQIPQ)=sRC`u zqYXerzNq83rrZIo_ABGE^FG8SX}ihrMYKvk4KfXCY|(|W6E#O%8xZ~A*m}3O&1_NH zZ&ff8sQ6Ar39mGbMioDKeChGGCt2o{w<>%EfIOqcV**KY3Gu#fJtvG_+iz^j*?WbJ z%REH-NEkchdok>*i*LV_cX-mP)NFxK!ns>CLvmG=Hku@%4CY>4b~S~2`RBPk3B8>a zX3|+P(v0$RYSxbwb#>RD3vtM%N_t^p>nc3+#@Ze`D%J$9>GQ%di1KYn!M ztq^Ml(RqegFP08b?ww^<`i{GL5GPZ&b=%TzWCD9IFhW}ot!$;*stDf@?85-DkHp#T za>MQiD`|b&VLc+hb%j|cZ6!*MUL-GYrsSbZX-j&#pTp+j$p>b+3h=sw>UQkvK+ou*NFP(u1__$%6+cOSISgk*M9CXKx7>R2D;mzmtR=|(}ywkGW-F+ZhRYy zzj$E|IFl4V@b7X2jh*C(KK|*gnK?gDm2Y&Ct#8Z&%8p})3*bKmR9g>~h9Z{*`%R!@ zAyF-MA-rLMSoGEZA1er_SKhy(-g~CVq{{3E@DEyg8+LP$1pCEEtBq z_JgG_dZ)1(1e8pkKr`EjNH4}SHKTtlJ{E_0(9y>v%u5YpQPxxr$n|KltJ+^=6X2=( z=C{QMd{Gv?Zh$$`{FTP&PSIpmf0`=_q?UbHW8Z1J+G^;1W!Lq-=QcPtJ8h&ZQ-I9r z*u~meaC&RccUm_jLw$SCF0>Pi2hepP5iB|nkJ0U6J#bk=WAVoQ>6%TNuKI=J_sxxT zq~W8*L_~KV4x(?(qVv=CdM#eN)f%U7? zcE&hgzV2sJcxC*lg944^{r+f2FtF$p9-Qb98XT7xHk0xx18!BOOJA|S9H+El^~|lN zpTyw5vGWY$uUf$WG{dW&d@&fv0d;YgavNGCQSSw8DS3ujZPqS{4A;*LG+^DY|Hw5Y z+`P{eNz5Ie*|)~wCObRg2V6$%?Z)+M$O}vCf!DwICBw^mTc9_K<&@DWC*W%S=W?9? zTn_bl$r+FAwPe*4B{*VjC7OdvR(d0Ek3zIC+ z^(0PD)aC#O`S}9&FiH0_nTC1cgd=Kb z9W*f1XgedfBNJCibUo3~-#!QHw#Ph0+A90P8j0k_X+Lgh)sV}>~L(&yMB&pe_h>aEGuA%6d|z`r+)ROqe$ zpWh^}9`!!d46e=?rvfj6e3g|S=5QHcJmg<4x zUdbw>&9~%$q+KT^u5@?wmiillOOhgP8huPX8N? zP5Ho;kRtrbHF}h4F}xmR*n1?+IsBP)NJ3F>4{0_^n=2)a?2CISl(D~YCrS{KTIrkL z`^!(?85ClyG=Cf_zdj8rtgj@BgN)7PjlU;Y30f5|$=aj|oZQcpYCp{vPTHy$@H;C}%7-k-z( delta 231 zcmWN=KS%;m7yxiS&+@d?s|GJH4*#HsNcT9y=h2Yk2|>@z(J^pw6F2FG*5q3pgXTc_ zhHR3zHMO`1F0O7mw)Oqs_wh1Ve?HD1Z1AydAE2~gDq&FT{%ahn9}dL!IbB9C$UoQ3lotSE4iLUQ=dQlq zx^IRcJ?&>j%28#P{GMI0SoGsjkn9=r1M#S`iy!VS48MGGJxKO{`bA|_S^X=$E126o vet={vs}?aqWlfO)?~oxB2$I(KW#~uMd|T_@tui*Rfvcm`zZ}hR3zI2Hi@8b{haQ{tj$#|1Wf0^H^jj*%< zblOy#ZsiVEm6yl=K3#Xz&d4mbSN~q=GOV!{p?-5bXdPl~S`cyUlh{}K(Ani$r`hg+ zelXL<&4~o#wGzkKf!~$ugXKe5Vx^)sVbr~YhRc|KN|Z- z0h50hph_h05qYrQ2U!8Zy@Kd_@CB(*p!~8l9#m z00FEfE8Lr5NJS&KNv8PtUdJJ)(Ek9fF(t^6110*b3&%vZ48C z--3j!-2;i%3kudXsT%H>U`ehRd%e-i!NqTUSY1nLRS{SMd11H95U#osM#oh{_lJBA zv(Fq3nA9wCwMd#ZoREv|?n*GrZq@lQ(-YR~W;B__DoKn^{}Zr!`tec37T!B@7Y`s1*Dyd9Q}Md*4^D@wo+ zyY7EvW-3cd5^a&Cq$P^p?E{`!FPb7E4UWc#Ui;El@}V9H3rAw_vwg|u3?8yTJ!hXj z@o>%z+tiTK(Z0PU`K0da#{Gedi$g7F!-L?2==KswN5YGupVD-ytr*27EYR`&_qajA zH9xlnwtlLL+#32Wo8D6jmtb;LR825!MuaQvUkas27_`WFjIC?XPY~0XHJZjn>f^8D zq8=QOz3_}Zs_=K1_dcG-z^wmibZgJYOSJaCc>wNsC8Rejhg1+86D7Oq%#bifh*_ZU zs@WS#w)FPIJ#Fn6&8*14P${8ozGl|8xYCcha2WQPSx!1W+2NOy8%5u)1T_-aRj(V- z^;*yLS;GPiR;Q0&>HfpuQ1Dz{QpL_z-MSRj+S6z1zz3%2Q*(Xs&^6J;Ld{Mvn@SRzDxY4_uJtk1!a#bb@f(JkdLOY;e04;2A+3-ld`sNG(|i^ XaPhP7?^pk~H2PUNC`r`xqvyI}0)KWZFc?Cy&wO?x<5 zLnd(ZL>XO1ritq}ACQe?oNOqs%CtCobA)^yBhzZ_$u|_@nC6_?Y@xV}nW<;b<_9V% zj4TI*W9mSbY@G0zt2w}9dw>UHi3>Z^LIwt=g^b&CH!&_@+MeIf=)uIsR0|vb3H2v;0Mjm#SBA_RV7`MNC!dS|(J#{u?9wXZt opsF>D+Yg;$T+g( @@ -118,12 +118,12 @@ a:label="UltraSonic Download Service" a:exported="false"> - - - - - - + + + + + + @@ -187,11 +187,11 @@ + a:authorities="org.moire.ultrasonic.provider.SearchSuggestionProvider"/> + a:value="org.moire.ultrasonic.activity.QueryReceiverActivity"/>

- - - - + + + +

- To submit feature requests or file bug reports, please visit the UltraSonic for Android forum. Source code for UltraSonic is available at github.com. + To submit feature requests or file bug reports, please visit the UltraSonic for Android forum. Source code for UltraSonic is available at github.com.

diff --git a/ultrasonic/src/main/assets/html/fr/index.html b/ultrasonic/src/main/assets/html/fr/index.html index 5073d94d..b2081f83 100644 --- a/ultrasonic/src/main/assets/html/fr/index.html +++ b/ultrasonic/src/main/assets/html/fr/index.html @@ -42,57 +42,19 @@

- Cliquez sur l'un des boutons suivants pour accéder à PayPal, d'où vous pourrez payer soit par carte de crédit, soit en utilisant votre compte PayPal. + Cliquez sur le bouton suivants pour accéder à PayPal, d'où vous pourrez payer soit par carte de crédit, soit en utilisant votre compte PayPal. Une fois le don reçu et traité, vous recevrez votre clé d'activation par e-mail.

- - - - - - - -
- - - - - - - -
10€
- 		- - - - - - - -
20€
- 		- - - - - - - -
25€
- 		- - - - - - - -
30€
-
+
+ + + + +

- Pour plus d'information, veuiller visitez subsonic.org. Le code source de UltraSonic est disponible à l'adresse suivante : github.com. + Pour plus d'information, veuiller visitez subsonic.org. Le code source de UltraSonic est disponible à l'adresse suivante : github.com.

diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java index 7e723e3d..411dbada 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -30,17 +30,17 @@ import android.widget.ListView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Pair; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.EntryAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Pair; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.EntryAdapter; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java index cd68bede..2e4bf1c8 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.os.AsyncTask; import android.os.Bundle; @@ -17,14 +17,14 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ChatAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ChatAdapter; import java.util.ArrayList; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java index 83c219a5..4ed38866 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.AlertDialog; import android.app.Dialog; @@ -50,21 +50,21 @@ import android.widget.TextView; import android.widget.ViewFlipper; import com.mobeta.android.dslv.DragSortListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.SilentBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.AutoRepeatButton; -import com.thejoshwa.ultrasonic.androidapp.view.SongListAdapter; -import com.thejoshwa.ultrasonic.androidapp.view.VisualizerView; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.SilentBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.AutoRepeatButton; +import org.moire.ultrasonic.view.SongListAdapter; +import org.moire.ultrasonic.view.VisualizerView; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -77,10 +77,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.COMPLETED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.IDLE; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PAUSED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.STOPPED; +import static org.moire.ultrasonic.domain.PlayerState.COMPLETED; +import static org.moire.ultrasonic.domain.PlayerState.IDLE; +import static org.moire.ultrasonic.domain.PlayerState.PAUSED; +import static org.moire.ultrasonic.domain.PlayerState.STOPPED; public class DownloadActivity extends SubsonicTabActivity implements OnGestureListener { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java index 529ec87c..58047244 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java @@ -16,7 +16,7 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.media.audiofx.Equalizer; import android.os.Bundle; @@ -30,10 +30,10 @@ import android.widget.LinearLayout; import android.widget.SeekBar; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.audiofx.EqualizerController; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.audiofx.EqualizerController; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; import java.util.HashMap; import java.util.Map; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java index 332affd5..874fe118 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.ActionBar; import android.content.Intent; @@ -32,9 +32,9 @@ import android.webkit.WebViewClient; import android.widget.Button; import android.widget.ImageView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; import net.simonvt.menudrawer.MenuDrawer; import net.simonvt.menudrawer.Position; @@ -50,9 +50,9 @@ public final class HelpActivity extends ResultActivity implements OnClickListene private ImageView backButton; private ImageView forwardButton; - private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; - private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; - private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final String STATE_MENUDRAWER = "org.moire.ultrasonic.menuDrawer"; + private static final String STATE_ACTIVE_VIEW_ID = "org.moire.ultrasonic.activeViewId"; + private static final String STATE_ACTIVE_POSITION = "org.moire.ultrasonic.activePosition"; public MenuDrawer menuDrawer; private int activePosition = 1; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java similarity index 81% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java index 16b3d291..f067c576 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java @@ -17,19 +17,19 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.os.Bundle; import android.view.View; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; /** * Displays song lyrics. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java index 56a2de6c..ed4a5f1e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.content.SharedPreferences; @@ -33,13 +33,13 @@ import android.widget.AdapterView; import android.widget.ListView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.MergeAdapter; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.MergeAdapter; +import org.moire.ultrasonic.util.Util; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java similarity index 84% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java index 042a10f2..2e458370 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java @@ -1,11 +1,11 @@ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.Activity; import android.content.Intent; import android.preference.PreferenceActivity; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Created by Joshua Bahnsen on 12/30/13. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java index ae14cf03..4000e107 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java @@ -17,16 +17,16 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.SearchManager; import android.content.Intent; import android.os.Bundle; import android.provider.SearchRecentSuggestions; -import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.provider.SearchSuggestionProvider; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Receives search queries and forwards to the SelectAlbumActivity. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java similarity index 83% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java index 44ed0c3d..26a57c2a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.Activity; import android.content.Intent; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Created by Joshua Bahnsen on 12/30/13. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java index 42b0e990..6ed7e942 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.Bundle; @@ -31,22 +31,22 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.MergeAdapter; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ArtistAdapter; -import com.thejoshwa.ultrasonic.androidapp.view.EntryAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.MergeAdapter; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ArtistAdapter; +import org.moire.ultrasonic.view.EntryAdapter; import java.util.ArrayList; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java index 2d5a53d4..7a2bd5df 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -34,19 +34,19 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.AlbumHeader; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.EntryByDiscAndTrackComparator; -import com.thejoshwa.ultrasonic.androidapp.util.Pair; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.EntryAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.AlbumHeader; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.EntryByDiscAndTrackComparator; +import org.moire.ultrasonic.util.Pair; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.EntryAdapter; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java index 6b01a155..48aaef8b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -35,17 +35,17 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ArtistAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ArtistAdapter; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java index 37813ac9..aa038463 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.content.Intent; import android.os.AsyncTask; @@ -32,15 +32,15 @@ import android.widget.ListView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.GenreAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.GenreAdapter; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java index 20c9a15f..b0874491 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.AlertDialog; import android.content.DialogInterface; @@ -43,19 +43,19 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.service.OfflineException; -import com.thejoshwa.ultrasonic.androidapp.service.ServerTooOldException; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.CacheCleaner; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.LoadingTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.PlaylistAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.service.OfflineException; +import org.moire.ultrasonic.service.ServerTooOldException; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.CacheCleaner; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.LoadingTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.PlaylistAdapter; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java index ca47a469..c3962cbf 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.ActionBar; import android.app.Dialog; @@ -39,19 +39,19 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.ErrorDialog; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.ModalBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpanPreference; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.provider.SearchSuggestionProvider; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.ErrorDialog; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.ModalBackgroundTask; +import org.moire.ultrasonic.util.TimeSpanPreference; +import org.moire.ultrasonic.util.Util; import net.simonvt.menudrawer.MenuDrawer; import net.simonvt.menudrawer.Position; @@ -96,9 +96,9 @@ public class SettingsActivity extends PreferenceResultActivity implements Shared private int maxServerCount = 10; private int minServerCount; - private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; - private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; - private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final String STATE_MENUDRAWER = "org.moire.ultrasonic.menuDrawer"; + private static final String STATE_ACTIVE_VIEW_ID = "org.moire.ultrasonic.activeViewId"; + private static final String STATE_ACTIVE_POSITION = "org.moire.ultrasonic.activePosition"; public MenuDrawer menuDrawer; private int activePosition = 1; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java index 78f2d80d..65670e11 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java @@ -17,7 +17,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.AlertDialog; import android.content.DialogInterface; @@ -44,20 +44,20 @@ import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; import com.handmark.pulltorefresh.library.PullToRefreshListView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.service.OfflineException; -import com.thejoshwa.ultrasonic.androidapp.service.ServerTooOldException; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.LoadingTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpan; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpanPicker; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.view.ShareAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.service.OfflineException; +import org.moire.ultrasonic.service.ServerTooOldException; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.LoadingTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.TimeSpan; +import org.moire.ultrasonic.util.TimeSpanPicker; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.view.ShareAdapter; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java index 1343fdef..d5a4ec08 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.annotation.SuppressLint; import android.app.ActionBar; @@ -52,28 +52,28 @@ import android.widget.ImageView; import android.widget.RemoteViews; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.BackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.EntryByDiscAndTrackComparator; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.ModalBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.ShareDetails; -import com.thejoshwa.ultrasonic.androidapp.util.SilentBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TabActivityBackgroundTask; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpan; -import com.thejoshwa.ultrasonic.androidapp.util.TimeSpanPicker; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.util.VideoPlayerType; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.BackgroundTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.EntryByDiscAndTrackComparator; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.ModalBackgroundTask; +import org.moire.ultrasonic.util.ShareDetails; +import org.moire.ultrasonic.util.SilentBackgroundTask; +import org.moire.ultrasonic.util.TabActivityBackgroundTask; +import org.moire.ultrasonic.util.TimeSpan; +import org.moire.ultrasonic.util.TimeSpanPicker; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.util.VideoPlayerType; import net.simonvt.menudrawer.MenuDrawer; import net.simonvt.menudrawer.Position; @@ -100,9 +100,9 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen private boolean destroyed; - private static final String STATE_MENUDRAWER = "com.thejoshwa.ultrasonic.androidapp.menuDrawer"; - private static final String STATE_ACTIVE_VIEW_ID = "com.thejoshwa.ultrasonic.androidapp.activeViewId"; - private static final String STATE_ACTIVE_POSITION = "com.thejoshwa.ultrasonic.androidapp.activePosition"; + private static final String STATE_MENUDRAWER = "org.moire.ultrasonic.menuDrawer"; + private static final String STATE_ACTIVE_VIEW_ID = "org.moire.ultrasonic.activeViewId"; + private static final String STATE_ACTIVE_POSITION = "org.moire.ultrasonic.activePosition"; private static final int DIALOG_ASK_FOR_SHARE_DETAILS = 102; public MenuDrawer menuDrawer; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java index a7c2e18c..fd51bf45 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java @@ -17,16 +17,16 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.activity; +package org.moire.ultrasonic.activity; import android.app.SearchManager; import android.content.Intent; import android.os.Bundle; import android.provider.SearchRecentSuggestions; -import com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.provider.SearchSuggestionProvider; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.Util; /** * Receives voice search queries and forwards to the SearchActivity. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java index 174fc677..80df615d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java @@ -16,14 +16,14 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.audiofx; +package org.moire.ultrasonic.audiofx; import android.content.Context; import android.media.MediaPlayer; import android.media.audiofx.Equalizer; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; +import org.moire.ultrasonic.util.FileUtil; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java index c1507bb5..95c7d3b7 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java @@ -16,7 +16,7 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.audiofx; +package org.moire.ultrasonic.audiofx; import android.media.MediaPlayer; import android.media.audiofx.Visualizer; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java index d3f9259f..24e35edb 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java index cc52301b..f3a4c84b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; import java.io.Serializable; import java.text.ParseException; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java index 258e2119..d5b71f7b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java index e56a0a1a..8ab360f3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java similarity index 79% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java index 67e31025..81fbdd86 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; import java.util.List; @@ -33,8 +33,8 @@ public class Indexes implements Serializable private static final long serialVersionUID = 8156117238598414701L; private final long lastModified; private final String ignoredArticles; - private final List shortcuts; - private final List artists; + private final List shortcuts; + private final List artists; public Indexes(long lastModified, String ignoredArticles, List shortcuts, List artists) { @@ -49,12 +49,12 @@ public class Indexes implements Serializable return lastModified; } - public List getShortcuts() + public List getShortcuts() { return shortcuts; } - public List getArtists() + public List getArtists() { return artists; } diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java index d7c5164b..2b2c1578 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java index b635e535..47d07245 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Song lyrics. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java similarity index 99% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java index 86c0bcdc..983a7a88 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; import java.text.ParseException; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java index beec72fb..30eb590d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Represents a top level directory in which music or other media is stored. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java index 0cedbd24..81f8179e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java index afa97877..c2a6db77 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java index e3cb000e..bae62f3f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java index 323ddb70..e3169a0a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * The criteria for a music search. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java index bb9616f6..08da3c8d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java index e24144cf..13f7a7a7 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Information about the Subsonic server. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java index 18bef43a..3c5e5392 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; import java.io.Serializable; import java.util.ArrayList; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java index 35417e6e..6853a3ae 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java @@ -16,7 +16,7 @@ Copyright 2013 (C) Joshua Bahnsen */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; /** * Information about the Subsonic server. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java index fd6a7a77..aedf40ea 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.domain; +package org.moire.ultrasonic.domain; import java.util.regex.Pattern; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java index 0e698cd7..4cca8444 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; import android.content.SearchRecentSuggestionsProvider; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java index 944c16b7..d4e986c6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; @@ -13,13 +13,13 @@ import android.util.Log; import android.view.KeyEvent; import android.widget.RemoteViews; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.MainActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.DownloadActivity; +import org.moire.ultrasonic.activity.MainActivity; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.FileUtil; public class UltraSonicAppWidgetProvider extends AppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java index 8c3b1690..0dfa8dcf 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x1 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java index 9581fb69..6dd9a019 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x2 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java index 52269d0a..0038c902 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x3 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java index 23bc9cee..35922218 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java @@ -16,9 +16,9 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.provider; +package org.moire.ultrasonic.provider; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; public class UltraSonicAppWidgetProvider4x4 extends UltraSonicAppWidgetProvider { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java similarity index 84% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java index 7064d957..721f0eb1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java @@ -1,12 +1,12 @@ -package com.thejoshwa.ultrasonic.androidapp.receiver; +package org.moire.ultrasonic.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; public class A2dpIntentReceiver extends BroadcastReceiver { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java index 9c75d3ac..4a731322 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.receiver; +package org.moire.ultrasonic.receiver; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; @@ -24,8 +24,8 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.Util; /** * Request media button focus when connected to Bluetooth A2DP. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java index 91d3600b..a98f3724 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.receiver; +package org.moire.ultrasonic.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,8 +25,8 @@ import android.os.Bundle; import android.os.Parcelable; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.util.Util; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java index 1a700357..e112084d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java @@ -16,31 +16,31 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.graphics.Bitmap; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.LRUCache; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.TimeLimitedCache; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.LRUCache; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.TimeLimitedCache; +import org.moire.ultrasonic.util.Util; import org.apache.http.HttpResponse; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java index 488ea343..69a138d8 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java @@ -16,18 +16,18 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.net.wifi.WifiManager; import android.os.PowerManager; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.CacheCleaner; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.CacheCleaner; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.Util; import org.apache.http.Header; import org.apache.http.HttpResponse; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java index c4e62da5..63e36a13 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; -import com.thejoshwa.ultrasonic.androidapp.audiofx.EqualizerController; -import com.thejoshwa.ultrasonic.androidapp.audiofx.VisualizerController; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; +import org.moire.ultrasonic.audiofx.EqualizerController; +import org.moire.ultrasonic.audiofx.VisualizerController; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java index 76f6d4f9..7c2e3efa 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.annotation.SuppressLint; import android.app.Notification; @@ -40,29 +40,29 @@ import android.util.Log; import android.widget.RemoteViews; import android.widget.SeekBar; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.audiofx.EqualizerController; -import com.thejoshwa.ultrasonic.androidapp.audiofx.VisualizerController; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x1; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x2; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x3; -import com.thejoshwa.ultrasonic.androidapp.provider.UltraSonicAppWidgetProvider4x4; -import com.thejoshwa.ultrasonic.androidapp.receiver.MediaButtonIntentReceiver; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.LRUCache; -import com.thejoshwa.ultrasonic.androidapp.util.ShufflePlayBuffer; -import com.thejoshwa.ultrasonic.androidapp.util.SimpleServiceBinder; -import com.thejoshwa.ultrasonic.androidapp.util.StreamProxy; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.DownloadActivity; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.audiofx.EqualizerController; +import org.moire.ultrasonic.audiofx.VisualizerController; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x1; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x2; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x3; +import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x4; +import org.moire.ultrasonic.receiver.MediaButtonIntentReceiver; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.LRUCache; +import org.moire.ultrasonic.util.ShufflePlayBuffer; +import org.moire.ultrasonic.util.SimpleServiceBinder; +import org.moire.ultrasonic.util.StreamProxy; +import org.moire.ultrasonic.util.Util; import java.io.File; import java.net.URLEncoder; @@ -71,14 +71,14 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.COMPLETED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.DOWNLOADING; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.IDLE; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PAUSED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PREPARED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.PREPARING; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.STARTED; -import static com.thejoshwa.ultrasonic.androidapp.domain.PlayerState.STOPPED; +import static org.moire.ultrasonic.domain.PlayerState.COMPLETED; +import static org.moire.ultrasonic.domain.PlayerState.DOWNLOADING; +import static org.moire.ultrasonic.domain.PlayerState.IDLE; +import static org.moire.ultrasonic.domain.PlayerState.PAUSED; +import static org.moire.ultrasonic.domain.PlayerState.PREPARED; +import static org.moire.ultrasonic.domain.PlayerState.PREPARING; +import static org.moire.ultrasonic.domain.PlayerState.STARTED; +import static org.moire.ultrasonic.domain.PlayerState.STOPPED; /** * @author Sindre Mehus, Joshua Bahnsen @@ -88,12 +88,12 @@ public class DownloadServiceImpl extends Service implements DownloadService { private static final String TAG = DownloadServiceImpl.class.getSimpleName(); - public static final String CMD_PLAY = "com.thejoshwa.ultrasonic.androidapp.CMD_PLAY"; - public static final String CMD_TOGGLEPAUSE = "com.thejoshwa.ultrasonic.androidapp.CMD_TOGGLEPAUSE"; - public static final String CMD_PAUSE = "com.thejoshwa.ultrasonic.androidapp.CMD_PAUSE"; - public static final String CMD_STOP = "com.thejoshwa.ultrasonic.androidapp.CMD_STOP"; - public static final String CMD_PREVIOUS = "com.thejoshwa.ultrasonic.androidapp.CMD_PREVIOUS"; - public static final String CMD_NEXT = "com.thejoshwa.ultrasonic.androidapp.CMD_NEXT"; + public static final String CMD_PLAY = "org.moire.ultrasonic.CMD_PLAY"; + public static final String CMD_TOGGLEPAUSE = "org.moire.ultrasonic.CMD_TOGGLEPAUSE"; + public static final String CMD_PAUSE = "org.moire.ultrasonic.CMD_PAUSE"; + public static final String CMD_STOP = "org.moire.ultrasonic.CMD_STOP"; + public static final String CMD_PREVIOUS = "org.moire.ultrasonic.CMD_PREVIOUS"; + public static final String CMD_NEXT = "org.moire.ultrasonic.CMD_NEXT"; private final IBinder binder = new SimpleServiceBinder(this); private Looper mediaPlayerLooper; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java index 1957b5a6..3441e95f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.BroadcastReceiver; import android.content.Context; @@ -29,11 +29,11 @@ import android.telephony.TelephonyManager; import android.util.Log; import android.view.KeyEvent; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.util.CacheCleaner; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.util.CacheCleaner; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.Util; import java.io.Serializable; import java.util.ArrayList; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java index 8a66c364..a43e0b98 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.os.Handler; @@ -27,11 +27,11 @@ import android.view.View; import android.widget.ProgressBar; import android.widget.Toast; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.service.parser.SubsonicRESTException; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.service.parser.SubsonicRESTException; +import org.moire.ultrasonic.util.Util; import java.util.ArrayList; import java.util.Iterator; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java index da5481d6..08ce0e2e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import java.io.File; @@ -28,8 +28,8 @@ import android.net.Uri; import android.provider.MediaStore; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.FileUtil; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java similarity index 86% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java index a082a855..1889eb2a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java @@ -16,27 +16,27 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.graphics.Bitmap; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.ProgressListener; import org.apache.http.HttpResponse; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java index db68dbd0..4cc80d75 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java @@ -16,11 +16,11 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Util; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java index 4bf8d641..845ba693 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; /** * Thrown by service methods that are not available in offline mode. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java index 1c89e2bf..44cc47f2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java @@ -16,29 +16,29 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.graphics.Bitmap; import android.media.MediaMetadataRetriever; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.Util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java index 11935dc3..8e2f0869 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.content.SharedPreferences; @@ -25,48 +25,48 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchCriteria; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.ServerInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.service.parser.AlbumListParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.BookmarkParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.ChatMessageParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.ErrorParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.GenreParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.IndexesParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.JukeboxStatusParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.LicenseParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.LyricsParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.MusicDirectoryParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.MusicFoldersParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.PlaylistParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.PlaylistsParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.RandomSongsParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.SearchResult2Parser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.SearchResultParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.ShareParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.UserInfoParser; -import com.thejoshwa.ultrasonic.androidapp.service.parser.VersionParser; -import com.thejoshwa.ultrasonic.androidapp.service.ssl.SSLSocketFactory; -import com.thejoshwa.ultrasonic.androidapp.service.ssl.TrustSelfSignedStrategy; -import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; -import com.thejoshwa.ultrasonic.androidapp.util.FileUtil; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.domain.SearchCriteria; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.ServerInfo; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.service.parser.AlbumListParser; +import org.moire.ultrasonic.service.parser.BookmarkParser; +import org.moire.ultrasonic.service.parser.ChatMessageParser; +import org.moire.ultrasonic.service.parser.ErrorParser; +import org.moire.ultrasonic.service.parser.GenreParser; +import org.moire.ultrasonic.service.parser.IndexesParser; +import org.moire.ultrasonic.service.parser.JukeboxStatusParser; +import org.moire.ultrasonic.service.parser.LicenseParser; +import org.moire.ultrasonic.service.parser.LyricsParser; +import org.moire.ultrasonic.service.parser.MusicDirectoryParser; +import org.moire.ultrasonic.service.parser.MusicFoldersParser; +import org.moire.ultrasonic.service.parser.PlaylistParser; +import org.moire.ultrasonic.service.parser.PlaylistsParser; +import org.moire.ultrasonic.service.parser.RandomSongsParser; +import org.moire.ultrasonic.service.parser.SearchResult2Parser; +import org.moire.ultrasonic.service.parser.SearchResultParser; +import org.moire.ultrasonic.service.parser.ShareParser; +import org.moire.ultrasonic.service.parser.UserInfoParser; +import org.moire.ultrasonic.service.parser.VersionParser; +import org.moire.ultrasonic.service.ssl.SSLSocketFactory; +import org.moire.ultrasonic.service.ssl.TrustSelfSignedStrategy; +import org.moire.ultrasonic.util.CancellableTask; +import org.moire.ultrasonic.util.Constants; +import org.moire.ultrasonic.util.FileUtil; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.Util; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -266,7 +266,7 @@ public class RESTMusicService implements MusicService return indexes; } - return cachedIndexes != null ? cachedIndexes : new Indexes(0, null, new ArrayList(), new ArrayList()); + return cachedIndexes != null ? cachedIndexes : new Indexes(0, null, new ArrayList(), new ArrayList()); } finally { @@ -313,7 +313,7 @@ public class RESTMusicService implements MusicService return indexes; } - return cachedArtists != null ? cachedArtists : new Indexes(0, null, new ArrayList(), new ArrayList()); + return cachedArtists != null ? cachedArtists : new Indexes(0, null, new ArrayList(), new ArrayList()); } finally { diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java index ca218e82..80bdc035 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java @@ -1,9 +1,9 @@ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Util; /** * Scrobbles played songs to Last.fm. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java index 6ab304c7..b0c2bd0f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service; +package org.moire.ultrasonic.service; /** * Thrown if the REST API version implemented by the server is too old. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java index 9ccc92f8..3dd3167b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Xml; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.util.Util; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java index 6036211d..77c85eb6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java similarity index 85% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java index 916247c9..2c51d9ad 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java similarity index 83% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java index 4760d5cd..43b8618b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java index 5588bc3d..dab1a694 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java index 1d8d5733..85104ae4 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java @@ -16,14 +16,14 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Genre; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java index 5cd734fd..faa39bd6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.Indexes; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.Indexes; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java index fa243325..a875e073 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java @@ -16,11 +16,11 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.domain.JukeboxStatus; +import org.moire.ultrasonic.domain.JukeboxStatus; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java similarity index 89% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java index 5bef3fea..bc16dba2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; @@ -24,8 +24,8 @@ import org.xmlpull.v1.XmlPullParser; import java.io.Reader; -import com.thejoshwa.ultrasonic.androidapp.domain.ServerInfo; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; +import org.moire.ultrasonic.domain.ServerInfo; +import org.moire.ultrasonic.domain.Version; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java index c8346e86..ee727359 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java @@ -16,13 +16,13 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Lyrics; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Lyrics; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java index d416d6f4..43f645ab 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java @@ -16,12 +16,12 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.Constants; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.Constants; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java index 5a86df3b..cdc6f1b1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java similarity index 88% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java index 767e4be1..3e882554 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import java.io.Reader; import java.util.ArrayList; @@ -26,9 +26,9 @@ import org.xmlpull.v1.XmlPullParser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicFolder; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicFolder; +import org.moire.ultrasonic.util.ProgressListener; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java index 540e0b1f..8f52f283 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java index a9e8ebdd..9362dd7e 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; -import com.thejoshwa.ultrasonic.androidapp.view.PlaylistAdapter; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.util.ProgressListener; +import org.moire.ultrasonic.view.PlaylistAdapter; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java index 3fa596db..ddfb4955 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java similarity index 85% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java index cf4d371c..f85f3eee 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java similarity index 83% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java index 0cc44308..238748f8 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java @@ -16,15 +16,15 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java similarity index 86% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java index 70458fd2..d8054591 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Share; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java similarity index 85% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java index a7a5dedc..abc1373f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java index 7daab834..d1ca92d3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.UserInfo; -import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.UserInfo; +import org.moire.ultrasonic.util.ProgressListener; import org.xmlpull.v1.XmlPullParser; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java index e58f7723..09d5ec6b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java @@ -16,9 +16,9 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.service.parser; +package org.moire.ultrasonic.service.parser; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; +import org.moire.ultrasonic.domain.Version; import java.io.BufferedReader; import java.io.Reader; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java similarity index 99% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java index 988aa63c..4f87e1ea 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java @@ -25,7 +25,7 @@ * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.conn.scheme.HostNameResolver; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java index 4b67390c..9b0104ce 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java @@ -24,7 +24,7 @@ * . * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java index f7b1d0a5..1e09924c 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java @@ -24,7 +24,7 @@ * . * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java index edb4616d..950588b9 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java @@ -24,7 +24,7 @@ * . * */ -package com.thejoshwa.ultrasonic.androidapp.service.ssl; +package org.moire.ultrasonic.service.ssl; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java index 757c973e..d0b4ecf1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java @@ -1,8 +1,8 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory; import java.util.HashSet; import java.util.Set; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java index 51c00d76..76448a18 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.os.Handler; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; import org.xmlpull.v1.XmlPullParserException; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java index 2cb38216..debc66c3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java @@ -1,13 +1,13 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.os.AsyncTask; import android.os.StatFs; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; +import org.moire.ultrasonic.domain.Playlist; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; import java.io.File; import java.util.ArrayList; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CancellableTask.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/CancellableTask.java index 89569b8e..eb3a1662 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CancellableTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CancellableTask.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.util.Log; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Constants.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Constants.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java index ac959abe..32a65b3a 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Constants.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; /** * @author Sindre Mehus @@ -131,7 +131,7 @@ public final class Constants public static final String PREFERENCES_KEY_IMAGE_LOADER_CONCURRENCY = "imageLoaderConcurrency"; // Name of the preferences file. - public static final String PREFERENCES_FILE_NAME = "com.thejoshwa.ultrasonic.androidapp_preferences"; + public static final String PREFERENCES_FILE_NAME = "org.moire.ultrasonic_preferences"; // Number of free trial days for non-licensed servers. public static final int FREE_TRIAL_DAYS = 30; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java index 42ff7e5b..3ec2a8c6 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/EntryByDiscAndTrackComparator.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory; import java.io.Serializable; import java.util.Comparator; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ErrorDialog.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ErrorDialog.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ErrorDialog.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ErrorDialog.java index f440c7f4..a2efddad 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ErrorDialog.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ErrorDialog.java @@ -16,13 +16,13 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java index 1e8f9b03..3fedccf4 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/FileUtil.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.graphics.Bitmap; @@ -24,9 +24,9 @@ import android.graphics.BitmapFactory; import android.os.Environment; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.Artist; +import org.moire.ultrasonic.domain.MusicDirectory; import java.io.File; import java.io.FileInputStream; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java index c2dba2a8..6391e66d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ImageLoader.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ImageLoader.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.content.res.Resources; @@ -30,10 +30,10 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LRUCache.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LRUCache.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LRUCache.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/LRUCache.java index ec3f1e28..2adc7cea 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LRUCache.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LRUCache.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.lang.ref.SoftReference; import java.util.HashMap; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java index 2f3bbfe9..2ad49d9f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/LoadingTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/LoadingTask.java @@ -1,11 +1,11 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.Build; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; +import org.moire.ultrasonic.activity.SubsonicTabActivity; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MergeAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java similarity index 99% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MergeAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java index 75e8815a..834cee30 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MergeAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java @@ -13,7 +13,7 @@ limitations under the License. */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.database.DataSetObserver; import android.view.View; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ModalBackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ModalBackgroundTask.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ModalBackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ModalBackgroundTask.java index cb7e7f7e..583de313 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ModalBackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ModalBackgroundTask.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MyViewFlipper.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MyViewFlipper.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MyViewFlipper.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/MyViewFlipper.java index 3a28a182..3d33e442 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/MyViewFlipper.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MyViewFlipper.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.util.AttributeSet; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Pair.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Pair.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java index 6c82973d..4bedd194 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Pair.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.io.Serializable; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ProgressListener.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ProgressListener.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java index 97b3d1f0..3b32a736 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ProgressListener.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ProgressListener.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SackOfViewsAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SackOfViewsAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java index 779851f5..22d7ed66 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SackOfViewsAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.view.View; import android.view.ViewGroup; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java similarity index 62% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java index 35b65626..91d4986d 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShareDetails.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShareDetails.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShufflePlayBuffer.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShufflePlayBuffer.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShufflePlayBuffer.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/ShufflePlayBuffer.java index 5b7d292a..8b476acd 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/ShufflePlayBuffer.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/ShufflePlayBuffer.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; import java.util.ArrayList; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SilentBackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SilentBackgroundTask.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SilentBackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/SilentBackgroundTask.java index d5310a22..6e751ed1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SilentBackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SilentBackgroundTask.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SimpleServiceBinder.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SimpleServiceBinder.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SimpleServiceBinder.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/SimpleServiceBinder.java index 9b2e00d0..47360a1b 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/SimpleServiceBinder.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SimpleServiceBinder.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.os.Binder; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/StreamProxy.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/StreamProxy.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java index 840a3466..848731f1 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/StreamProxy.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/StreamProxy.java @@ -1,10 +1,10 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.util.Log; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; import org.apache.http.HttpRequest; import org.apache.http.message.BasicHttpRequest; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TabActivityBackgroundTask.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TabActivityBackgroundTask.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TabActivityBackgroundTask.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TabActivityBackgroundTask.java index e1fe3e0f..408a3355 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TabActivityBackgroundTask.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TabActivityBackgroundTask.java @@ -1,6 +1,6 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; +import org.moire.ultrasonic.activity.SubsonicTabActivity; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeLimitedCache.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeLimitedCache.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeLimitedCache.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeLimitedCache.java index 729825fe..1a39a440 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeLimitedCache.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeLimitedCache.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.lang.ref.SoftReference; import java.util.concurrent.TimeUnit; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpan.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpan.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpan.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpan.java index c72bb29a..e4ac46c9 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpan.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpan.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import java.util.Calendar; import java.util.Date; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPicker.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.java similarity index 98% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPicker.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.java index b582c196..2b294861 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPicker.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPicker.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.content.res.Resources; @@ -14,7 +14,7 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.Spinner; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; /** * Created by Joshua Bahnsen on 12/22/13. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPreference.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java similarity index 95% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPreference.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java index 60736cb6..7f1840b3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/TimeSpanPreference.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/TimeSpanPreference.java @@ -1,11 +1,11 @@ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.content.Context; import android.preference.DialogPreference; import android.util.AttributeSet; import android.view.View; -import com.thejoshwa.ultrasonic.androidapp.R; +import org.moire.ultrasonic.R; import java.util.regex.Pattern; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Util.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Util.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java index f1cb024b..c191d179 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/Util.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; @@ -50,21 +50,21 @@ import android.view.KeyEvent; import android.widget.RemoteViews; import android.widget.Toast; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.DownloadActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.MainActivity; -import com.thejoshwa.ultrasonic.androidapp.activity.SettingsActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Bookmark; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.domain.RepeatMode; -import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult; -import com.thejoshwa.ultrasonic.androidapp.domain.Version; -import com.thejoshwa.ultrasonic.androidapp.receiver.MediaButtonIntentReceiver; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.DownloadActivity; +import org.moire.ultrasonic.activity.MainActivity; +import org.moire.ultrasonic.activity.SettingsActivity; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.domain.SearchResult; +import org.moire.ultrasonic.domain.Version; +import org.moire.ultrasonic.receiver.MediaButtonIntentReceiver; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; import org.apache.http.HttpEntity; @@ -105,8 +105,8 @@ public class Util extends DownloadActivity private static DecimalFormat KILO_BYTE_LOCALIZED_FORMAT; private static DecimalFormat BYTE_LOCALIZED_FORMAT; - public static final String EVENT_META_CHANGED = "com.thejoshwa.ultrasonic.androidapp.EVENT_META_CHANGED"; - public static final String EVENT_PLAYSTATE_CHANGED = "com.thejoshwa.ultrasonic.androidapp.EVENT_PLAYSTATE_CHANGED"; + public static final String EVENT_META_CHANGED = "org.moire.ultrasonic.EVENT_META_CHANGED"; + public static final String EVENT_PLAYSTATE_CHANGED = "org.moire.ultrasonic.EVENT_PLAYSTATE_CHANGED"; public static final String CM_AVRCP_PLAYSTATE_CHANGED = "com.android.music.playstatechanged"; public static final String CM_AVRCP_METADATA_CHANGED = "com.android.music.metachanged"; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java index dda57d45..a03036a4 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/VideoPlayerType.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java @@ -16,7 +16,7 @@ Copyright 2013 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.util; +package org.moire.ultrasonic.util; import android.app.Activity; import android.app.AlertDialog; @@ -24,9 +24,9 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicServiceFactory; /** * @author Sindre Mehus diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AlbumView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AlbumView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java index b8c38319..6d5e85a0 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AlbumView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.graphics.drawable.Drawable; @@ -26,12 +26,12 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.Util; /** * Used to display albums in a {@code ListView}. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ArtistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ArtistAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java index 8d54d3a6..c153e3dc 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ArtistAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java @@ -16,14 +16,14 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.widget.ArrayAdapter; import android.widget.SectionIndexer; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Artist; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Artist; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java similarity index 97% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java index d4badc01..b86a2086 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/AutoRepeatButton.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.util.AttributeSet; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ChatAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ChatAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java index 5d81f706..9fc000c2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ChatAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ChatAdapter.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.text.method.LinkMovementMethod; import android.text.util.Linkify; @@ -9,11 +9,11 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.ChatMessage; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.ChatMessage; +import org.moire.ultrasonic.util.ImageLoader; +import org.moire.ultrasonic.util.Util; import java.text.DateFormat; import java.util.Date; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/EntryAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/EntryAdapter.java similarity index 92% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/EntryAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/EntryAdapter.java index 7e7d0fde..4b3b5317 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/EntryAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/EntryAdapter.java @@ -16,7 +16,7 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.view.View; import android.view.ViewGroup; @@ -25,9 +25,9 @@ import android.widget.CheckedTextView; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.util.ImageLoader; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.util.ImageLoader; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/GenreAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java similarity index 93% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/GenreAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java index 895fc3b2..ba194f10 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/GenreAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java @@ -16,14 +16,14 @@ Copyright 2010 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.widget.ArrayAdapter; import android.widget.SectionIndexer; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Genre; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Genre; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistAdapter.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistAdapter.java index 9d6f1e7f..39d6bbce 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistAdapter.java @@ -1,13 +1,13 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.Playlist; import java.io.Serializable; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistView.java similarity index 90% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistView.java index b518fbab..f8919709 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/PlaylistView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PlaylistView.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.view.LayoutInflater; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Playlist; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Playlist; /** * Used to display playlists in a {@code ListView}. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java similarity index 87% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java index e35c5641..b1ae9ca7 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareAdapter.java @@ -1,13 +1,13 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.activity.SubsonicTabActivity; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.activity.SubsonicTabActivity; +import org.moire.ultrasonic.domain.Share; import java.io.Serializable; import java.util.Collections; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java index 82bdeab3..ffe5fdce 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/ShareView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ShareView.java @@ -16,14 +16,14 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.view.LayoutInflater; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.Share; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.Share; /** * Used to display playlists in a {@code ListView}. diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongListAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java similarity index 86% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongListAdapter.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java index 111b9cd4..1844e4d2 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongListAdapter.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java @@ -1,12 +1,12 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; +import org.moire.ultrasonic.domain.MusicDirectory; +import org.moire.ultrasonic.service.DownloadFile; import java.util.List; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java similarity index 94% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java index f8982346..83ba491f 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/SongView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongView.java @@ -16,7 +16,7 @@ Copyright 2009 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -29,15 +29,15 @@ import android.widget.CheckedTextView; import android.widget.ImageView; import android.widget.TextView; -import com.thejoshwa.ultrasonic.androidapp.R; -import com.thejoshwa.ultrasonic.androidapp.domain.MusicDirectory.Entry; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadFile; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; -import com.thejoshwa.ultrasonic.androidapp.service.MusicService; -import com.thejoshwa.ultrasonic.androidapp.service.MusicServiceFactory; -import com.thejoshwa.ultrasonic.androidapp.util.Util; -import com.thejoshwa.ultrasonic.androidapp.util.VideoPlayerType; +import org.moire.ultrasonic.R; +import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.service.DownloadFile; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; +import org.moire.ultrasonic.service.MusicService; +import org.moire.ultrasonic.service.MusicServiceFactory; +import org.moire.ultrasonic.util.Util; +import org.moire.ultrasonic.util.VideoPlayerType; import java.io.File; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/UpdateView.java similarity index 96% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/UpdateView.java index 21dac706..1dea8db3 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/UpdateView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/UpdateView.java @@ -1,4 +1,4 @@ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.os.Handler; @@ -8,7 +8,7 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.LinearLayout; -import com.thejoshwa.ultrasonic.androidapp.util.Util; +import org.moire.ultrasonic.util.Util; import java.util.ArrayList; import java.util.Collection; diff --git a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/VisualizerView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/VisualizerView.java similarity index 91% rename from ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/VisualizerView.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/view/VisualizerView.java index dd90d4a6..c8aafa47 100644 --- a/ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/view/VisualizerView.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/VisualizerView.java @@ -16,7 +16,7 @@ Copyright 2011 (C) Sindre Mehus */ -package com.thejoshwa.ultrasonic.androidapp.view; +package org.moire.ultrasonic.view; import android.content.Context; import android.graphics.Canvas; @@ -25,10 +25,10 @@ import android.graphics.Paint; import android.media.audiofx.Visualizer; import android.view.View; -import com.thejoshwa.ultrasonic.androidapp.audiofx.VisualizerController; -import com.thejoshwa.ultrasonic.androidapp.domain.PlayerState; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadService; -import com.thejoshwa.ultrasonic.androidapp.service.DownloadServiceImpl; +import org.moire.ultrasonic.audiofx.VisualizerController; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.service.DownloadService; +import org.moire.ultrasonic.service.DownloadServiceImpl; /** * A simple class that draws waveform data received from a diff --git a/ultrasonic/src/main/res/layout-land/download.xml b/ultrasonic/src/main/res/layout-land/download.xml index 1fb0425c..df93d6dc 100644 --- a/ultrasonic/src/main/res/layout-land/download.xml +++ b/ultrasonic/src/main/res/layout-land/download.xml @@ -4,7 +4,7 @@ a:layout_height="fill_parent" a:orientation="horizontal"> - - + - - + diff --git a/ultrasonic/src/main/res/layout/download_playlist.xml b/ultrasonic/src/main/res/layout/download_playlist.xml index 72e32883..6502ff20 100644 --- a/ultrasonic/src/main/res/layout/download_playlist.xml +++ b/ultrasonic/src/main/res/layout/download_playlist.xml @@ -15,7 +15,7 @@ a:padding="10dip"/> - - - \ No newline at end of file diff --git a/ultrasonic/src/main/res/xml/settings.xml b/ultrasonic/src/main/res/xml/settings.xml index cf5b0bee..e4e2b4bd 100644 --- a/ultrasonic/src/main/res/xml/settings.xml +++ b/ultrasonic/src/main/res/xml/settings.xml @@ -148,7 +148,7 @@ -