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

Changed package name

This commit is contained in:
Óscar García Amor 2015-07-26 18:15:07 +02:00
parent c00746dfae
commit 879d86eaa1
147 changed files with 687 additions and 725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/2.2.1/taskArtifacts/cache.properties.lock
View File

Binary file not shown.

BIN
.gradle/2.2.1/taskArtifacts/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
View File

Binary file not shown.

BIN
.gradle/2.2.1/taskArtifacts/outputFileStates.bin
View File

Binary file not shown.

BIN
.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
View File

Binary file not shown.

2
ultrasonic/build.gradle
View File

@ -5,7 +5,7 @@ android {
buildToolsVersion "22.0.1"
defaultConfig {
applicationId "com.thejoshwa.ultrasonic.androidapp"
applicationId "org.moire.ultrasonic"
minSdkVersion 14
targetSdkVersion 22
}

18
ultrasonic/src/main/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
package="com.thejoshwa.ultrasonic.androidapp"
package="org.moire.ultrasonic"
a:installLocation="auto"
a:versionCode="48"
a:versionName="1.3.0.8">
@ -118,12 +118,12 @@
a:label="UltraSonic Download Service"
a:exported="false">
<intent-filter>
<action a:name="com.thejoshwa.ultrasonic.androidapp.CMD_TOGGLEPAUSE"/>
<action a:name="com.thejoshwa.ultrasonic.androidapp.CMD_PLAY"/>
<action a:name="com.thejoshwa.ultrasonic.androidapp.CMD_PAUSE"/>
<action a:name="com.thejoshwa.ultrasonic.androidapp.CMD_NEXT"/>
<action a:name="com.thejoshwa.ultrasonic.androidapp.CMD_PREVIOUS"/>
<action a:name="com.thejoshwa.ultrasonic.androidapp.CMD_STOP"/>
<action a:name="org.moire.ultrasonic.CMD_TOGGLEPAUSE"/>
<action a:name="org.moire.ultrasonic.CMD_PLAY"/>
<action a:name="org.moire.ultrasonic.CMD_PAUSE"/>
<action a:name="org.moire.ultrasonic.CMD_NEXT"/>
<action a:name="org.moire.ultrasonic.CMD_PREVIOUS"/>
<action a:name="org.moire.ultrasonic.CMD_STOP"/>
</intent-filter>
</service>
@ -187,11 +187,11 @@
<provider
a:name=".provider.SearchSuggestionProvider"
a:authorities="com.thejoshwa.ultrasonic.androidapp.provider.SearchSuggestionProvider"/>
a:authorities="org.moire.ultrasonic.provider.SearchSuggestionProvider"/>
<meta-data
a:name="android.app.default_searchable"
a:value="com.thejoshwa.ultrasonic.androidapp.activity.QueryReceiverActivity"/>
a:value="org.moire.ultrasonic.activity.QueryReceiverActivity"/>
<receiver
a:name=".receiver.A2dpIntentReceiver"

10
ultrasonic/src/main/assets/html/en/index.html
View File

@ -31,14 +31,14 @@
</p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="TVZ3F8DRFJ2JN">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="DQXEZRDRAGCA8">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
<p>
To submit feature requests or file bug reports, please visit the UltraSonic for Android <a href="http://forum.subsonic.org/forum/viewforum.php?f=17">forum</a>. Source code for UltraSonic is available at <a href="https://github.com/archrival/Subsonic-Android">github.com</a>.
To submit feature requests or file bug reports, please visit the UltraSonic for Android <a href="http://forum.subsonic.org/forum/viewforum.php?f=17">forum</a>. Source code for UltraSonic is available at <a href="https://github.com/ogarcia/ultrasonic">github.com</a>.
</p>
</body>

54
ultrasonic/src/main/assets/html/fr/index.html
View File

@ -42,57 +42,19 @@
</p>
<p>
Cliquez sur l'un des boutons suivants pour acc&eacute;der &agrave; PayPal, d'o&ugrave; vous pourrez payer soit par carte de cr&eacute;dit, soit en utilisant votre compte PayPal.
Cliquez sur le bouton suivants pour acc&eacute;der &agrave; PayPal, d'o&ugrave; vous pourrez payer soit par carte de cr&eacute;dit, soit en utilisant votre compte PayPal.
Une fois le don re&ccedil;u et trait&eacute;, vous recevrez votre cl&eacute; d'activation par e-mail.
</p>
<table>
<tr>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3RTGWJRNAW2PU"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">10&euro;</td>
</tr>
</table>
</td>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UCUUB2TYE4PGN"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">20&euro;</td>
</tr>
</table>
</td>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3M6TFHWEPSU44"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">25&euro;</td>
</tr>
</table>
</td>
<td style="border:none;">
<table>
<tr>
<td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5KP7LPQU77UAS"><img src="../img/paypal.png" alt=""/></a> </td>
</tr>
<tr>
<td style="text-align:center;border:none;padding:0">30&euro;</td>
</tr>
</table>
</td>
</tr>
</table>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="DQXEZRDRAGCA8">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
<p>
Pour plus d'information, veuiller visitez <a href="http://subsonic.org/">subsonic.org</a>. Le code source de UltraSonic est disponible &agrave l'adresse suivante : <a href="https://github.com/archrival/Subsonic-Android">github.com</a>.
Pour plus d'information, veuiller visitez <a href="http://subsonic.org/">subsonic.org</a>. Le code source de UltraSonic est disponible &agrave l'adresse suivante : <a href="https://github.com/ogarcia/ultrasonic">github.com</a>.
</p>
</body>

24
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/BookmarkActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/BookmarkActivity.java
View File

@ -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;

18
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ChatActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/ChatActivity.java
View File

@ -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;

40
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/DownloadActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/DownloadActivity.java
View File

@ -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
{

10
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/EqualizerActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/EqualizerActivity.java
View File

@ -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;

14
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/HelpActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java
View File

@ -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;

16
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/LyricsActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/LyricsActivity.java
View File

@ -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.

16
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/MainActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/MainActivity.java
View File

@ -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;

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/PreferenceResultActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/PreferenceResultActivity.java
View File

@ -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.

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/QueryReceiverActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/QueryReceiverActivity.java
View File

@ -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.

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ResultActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/ResultActivity.java
View File

@ -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.

34
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SearchActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SearchActivity.java
View File

@ -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;

28
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java
View File

@ -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;

24
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectArtistActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectArtistActivity.java
View File

@ -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;

20
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectGenreActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectGenreActivity.java
View File

@ -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;

28
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectPlaylistActivity.java
View File

@ -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;

34
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SettingsActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SettingsActivity.java
View File

@ -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;

30
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/ShareActivity.java
View File

@ -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;

52
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/SubsonicTabActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/activity/VoiceQueryReceiverActivity.java → ultrasonic/src/main/java/org/moire/ultrasonic/activity/VoiceQueryReceiverActivity.java
View File

@ -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.

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/EqualizerController.java → ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/EqualizerController.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/audiofx/VisualizerController.java → ultrasonic/src/main/java/org/moire/ultrasonic/audiofx/VisualizerController.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Artist.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Artist.java
View File

@ -16,7 +16,7 @@
Copyright 2009 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
import java.io.Serializable;

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Bookmark.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Bookmark.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ChatMessage.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/ChatMessage.java
View File

@ -1,4 +1,4 @@
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
import java.io.Serializable;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Genre.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java
View File

@ -1,4 +1,4 @@
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
import java.io.Serializable;

10
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Indexes.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Indexes.java
View File

@ -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<com.thejoshwa.ultrasonic.androidapp.domain.Artist> shortcuts;
private final List<com.thejoshwa.ultrasonic.androidapp.domain.Artist> artists;
private final List<org.moire.ultrasonic.domain.Artist> shortcuts;
private final List<org.moire.ultrasonic.domain.Artist> artists;
public Indexes(long lastModified, String ignoredArticles, List<Artist> shortcuts, List<Artist> artists)
{
@ -49,12 +49,12 @@ public class Indexes implements Serializable
return lastModified;
}
public List<com.thejoshwa.ultrasonic.androidapp.domain.Artist> getShortcuts()
public List<org.moire.ultrasonic.domain.Artist> getShortcuts()
{
return shortcuts;
}
public List<com.thejoshwa.ultrasonic.androidapp.domain.Artist> getArtists()
public List<org.moire.ultrasonic.domain.Artist> getArtists()
{
return artists;
}

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/JukeboxStatus.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/JukeboxStatus.java
View File

@ -16,7 +16,7 @@
Copyright 2009 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
/**
* @author Sindre Mehus

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Lyrics.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Lyrics.java
View File

@ -16,7 +16,7 @@
Copyright 2010 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
/**
* Song lyrics.

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicDirectory.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicDirectory.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/MusicFolder.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java
View File

@ -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.

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/PlayerState.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/PlayerState.java
View File

@ -16,7 +16,7 @@
Copyright 2009 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
/**
* @author Sindre Mehus

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Playlist.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Playlist.java
View File

@ -16,7 +16,7 @@
Copyright 2009 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
import java.io.Serializable;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/RepeatMode.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/RepeatMode.java
View File

@ -1,4 +1,4 @@
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
/**
* @author Sindre Mehus

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchCriteria.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchCriteria.java
View File

@ -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.

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/SearchResult.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/SearchResult.java
View File

@ -16,7 +16,7 @@
Copyright 2009 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.domain;
package org.moire.ultrasonic.domain;
import java.util.List;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/ServerInfo.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/ServerInfo.java
View File

@ -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.

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Share.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Share.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/UserInfo.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/UserInfo.java
View File

@ -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.

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/domain/Version.java → ultrasonic/src/main/java/org/moire/ultrasonic/domain/Version.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/SearchSuggestionProvider.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/SearchSuggestionProvider.java
View File

@ -16,7 +16,7 @@
Copyright 2010 (C) Sindre Mehus
*/
package com.thejoshwa.ultrasonic.androidapp.provider;
package org.moire.ultrasonic.provider;
import android.content.SearchRecentSuggestionsProvider;

16
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java
View File

@ -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
{

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x1.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java
View File

@ -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
{

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x2.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java
View File

@ -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
{

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x3.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java
View File

@ -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
{

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/provider/UltraSonicAppWidgetProvider4x4.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java
View File

@ -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
{

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/A2dpIntentReceiver.java → ultrasonic/src/main/java/org/moire/ultrasonic/receiver/A2dpIntentReceiver.java
View File

@ -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
{

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/BluetoothIntentReceiver.java → ultrasonic/src/main/java/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.java
View File

@ -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.

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/receiver/MediaButtonIntentReceiver.java → ultrasonic/src/main/java/org/moire/ultrasonic/receiver/MediaButtonIntentReceiver.java
View File

@ -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

42
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java
View File

@ -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;

12
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadFile.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
View File

@ -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;

12
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadService.java
View File

@ -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;

76
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceImpl.java
View File

@ -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<DownloadService>(this);
private Looper mediaPlayerLooper;

12
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceLifecycleSupport.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadServiceLifecycleSupport.java
View File

@ -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;

12
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/JukeboxService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/JukeboxService.java
View File

@ -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;

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MediaStoreService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaStoreService.java
View File

@ -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

34
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java
View File

@ -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;

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/MusicServiceFactory.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicServiceFactory.java
View File

@ -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

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineException.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineException.java
View File

@ -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.

34
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/OfflineMusicService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java
View File

@ -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;

90
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
View File

@ -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<com.thejoshwa.ultrasonic.androidapp.domain.Artist>(), new ArrayList<com.thejoshwa.ultrasonic.androidapp.domain.Artist>());
return cachedIndexes != null ? cachedIndexes : new Indexes(0, null, new ArrayList<org.moire.ultrasonic.domain.Artist>(), new ArrayList<org.moire.ultrasonic.domain.Artist>());
}
finally
{
@ -313,7 +313,7 @@ public class RESTMusicService implements MusicService
return indexes;
}
return cachedArtists != null ? cachedArtists : new Indexes(0, null, new ArrayList<com.thejoshwa.ultrasonic.androidapp.domain.Artist>(), new ArrayList<com.thejoshwa.ultrasonic.androidapp.domain.Artist>());
return cachedArtists != null ? cachedArtists : new Indexes(0, null, new ArrayList<org.moire.ultrasonic.domain.Artist>(), new ArrayList<org.moire.ultrasonic.domain.Artist>());
}
finally
{

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/Scrobbler.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/Scrobbler.java
View File

@ -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.

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ServerTooOldException.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/ServerTooOldException.java
View File

@ -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.

10
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AbstractParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AbstractParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/AlbumListParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/AlbumListParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/BookmarkParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/BookmarkParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ChatMessageParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ChatMessageParser.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ErrorParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ErrorParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/GenreParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/GenreParser.java
View File

@ -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;

10
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/IndexesParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/IndexesParser.java
View File

@ -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;

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/JukeboxStatusParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java
View File

@ -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;

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LicenseParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LicenseParser.java
View File

@ -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

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/LyricsParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/LyricsParser.java
View File

@ -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;

6
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryEntryParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryEntryParser.java
View File

@ -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

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicDirectoryParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicDirectoryParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/MusicFoldersParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/MusicFoldersParser.java
View File

@ -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

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistParser.java
View File

@ -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;

10
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/PlaylistsParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/PlaylistsParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/RandomSongsParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/RandomSongsParser.java
View File

@ -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;

12
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResult2Parser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResult2Parser.java
View File

@ -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;

12
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SearchResultParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SearchResultParser.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/ShareParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/SubsonicRESTException.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/SubsonicRESTException.java
View File

@ -1,4 +1,4 @@
package com.thejoshwa.ultrasonic.androidapp.service.parser;
package org.moire.ultrasonic.service.parser;
/**
* @author Sindre Mehus

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/UserInfoParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/UserInfoParser.java
View File

@ -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;

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/parser/VersionParser.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/VersionParser.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/SSLSocketFactory.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/SSLSocketFactory.java
View File

@ -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;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustManagerDecorator.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustManagerDecorator.java
View File

@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
package com.thejoshwa.ultrasonic.androidapp.service.ssl;
package org.moire.ultrasonic.service.ssl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustSelfSignedStrategy.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustSelfSignedStrategy.java
View File

@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
package com.thejoshwa.ultrasonic.androidapp.service.ssl;
package org.moire.ultrasonic.service.ssl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;

2
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/service/ssl/TrustStrategy.java → ultrasonic/src/main/java/org/moire/ultrasonic/service/ssl/TrustStrategy.java
View File

@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
package com.thejoshwa.ultrasonic.androidapp.service.ssl;
package org.moire.ultrasonic.service.ssl;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/AlbumHeader.java → ultrasonic/src/main/java/org/moire/ultrasonic/util/AlbumHeader.java
View File

@ -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;

4
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/BackgroundTask.java → ultrasonic/src/main/java/org/moire/ultrasonic/util/BackgroundTask.java
View File

@ -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;

8
ultrasonic/src/main/java/com/thejoshwa/ultrasonic/androidapp/util/CacheCleaner.java → ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More