aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/app.iml10
-rw-r--r--app/build.gradle5
-rw-r--r--app/libs/cling-core-2.0.1.jarbin686501 -> 0 bytes
-rw-r--r--app/libs/cling-support-2.0.1.jarbin490043 -> 0 bytes
-rw-r--r--app/libs/javax.servlet-3.0.0.v201112011016.jarbin200387 -> 0 bytes
-rw-r--r--app/libs/jetty-all-8.1.16.v20140903.jarbin1880786 -> 0 bytes
-rw-r--r--app/libs/seamless-http-1.1.0.jarbin21646 -> 0 bytes
-rw-r--r--app/libs/seamless-util-1.1.0.jarbin94456 -> 0 bytes
-rw-r--r--app/libs/seamless-xml-1.1.0.jarbin63142 -> 0 bytes
-rw-r--r--app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java60
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/Util.java2
-rw-r--r--app/src/main/res/values/strings.xml1
12 files changed, 48 insertions, 30 deletions
diff --git a/app/app.iml b/app/app.iml
index e50d2481..573f65e3 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -88,19 +88,27 @@
<orderEntry type="library" exported="" name="mediarouter-v7-22.1.1" level="project" />
<orderEntry type="library" exported="" name="seamless-util-1.1.0" level="project" />
<orderEntry type="library" exported="" name="cling-core-2.0.1" level="project" />
+ <orderEntry type="library" exported="" name="jetty-continuation-8.1.16.v20140903" level="project" />
<orderEntry type="library" exported="" name="javax.servlet-3.0.0.v201112011016" level="project" />
+ <orderEntry type="library" exported="" name="jetty-server-8.1.16.v20140903" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
<orderEntry type="library" exported="" name="play-services-cast-7.0.0" level="project" />
<orderEntry type="library" exported="" name="cling-support-2.0.1" level="project" />
<orderEntry type="library" exported="" name="seamless-http-1.1.0" level="project" />
+ <orderEntry type="library" exported="" name="jetty-util-8.1.16.v20140903" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
+ <orderEntry type="library" exported="" name="seamless-swing-1.1.0" level="project" />
<orderEntry type="library" exported="" name="seamless-xml-1.1.0" level="project" />
+ <orderEntry type="library" exported="" name="jetty-io-8.1.16.v20140903" level="project" />
<orderEntry type="library" exported="" name="CWAC-EndlessAdapter" level="project" />
+ <orderEntry type="library" exported="" name="jetty-security-8.1.16.v20140903" level="project" />
<orderEntry type="library" exported="" name="kryo-2.21-all" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
- <orderEntry type="library" exported="" name="jetty-all-8.1.16.v20140903" level="project" />
+ <orderEntry type="library" exported="" name="jetty-servlet-8.1.16.v20140903" level="project" />
<orderEntry type="library" exported="" name="CWAC-AdapterWrapper" level="project" />
+ <orderEntry type="library" exported="" name="jetty-http-8.1.16.v20140903" level="project" />
+ <orderEntry type="library" exported="" name="jetty-client-8.1.16.v20140903" level="project" />
<orderEntry type="module" module-name="DragSort ListView" exported="" />
<orderEntry type="module" module-name="Server Proxy" exported="" />
</component>
diff --git a/app/build.gradle b/app/build.gradle
index e74cfa3e..7f95da39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,4 +33,9 @@ dependencies {
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:mediarouter-v7:22.1.1'
compile 'com.google.android.gms:play-services-cast:7.0.0'
+ compile group: 'org.fourthline.cling', name: 'cling-core', version:'2.0.1'
+ compile group: 'org.fourthline.cling', name: 'cling-support', version:'2.0.1'
+ compile group: 'org.eclipse.jetty', name: 'jetty-server', version:'8.1.16.v20140903'
+ compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'8.1.16.v20140903'
+ compile group: 'org.eclipse.jetty', name: 'jetty-client', version:'8.1.16.v20140903'
}
diff --git a/app/libs/cling-core-2.0.1.jar b/app/libs/cling-core-2.0.1.jar
deleted file mode 100644
index 632d3038..00000000
--- a/app/libs/cling-core-2.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/cling-support-2.0.1.jar b/app/libs/cling-support-2.0.1.jar
deleted file mode 100644
index 7fa28604..00000000
--- a/app/libs/cling-support-2.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/javax.servlet-3.0.0.v201112011016.jar b/app/libs/javax.servlet-3.0.0.v201112011016.jar
deleted file mode 100644
index b1354096..00000000
--- a/app/libs/javax.servlet-3.0.0.v201112011016.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/jetty-all-8.1.16.v20140903.jar b/app/libs/jetty-all-8.1.16.v20140903.jar
deleted file mode 100644
index 25b1d324..00000000
--- a/app/libs/jetty-all-8.1.16.v20140903.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/seamless-http-1.1.0.jar b/app/libs/seamless-http-1.1.0.jar
deleted file mode 100644
index 98ec884a..00000000
--- a/app/libs/seamless-http-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/seamless-util-1.1.0.jar b/app/libs/seamless-util-1.1.0.jar
deleted file mode 100644
index 12026b7f..00000000
--- a/app/libs/seamless-util-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/seamless-xml-1.1.0.jar b/app/libs/seamless-xml-1.1.0.jar
deleted file mode 100644
index 1e740877..00000000
--- a/app/libs/seamless-xml-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index fa7e3404..43d85cdd 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -222,7 +222,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
albumArtImageView.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent me) {
- if(me.getAction() == MotionEvent.ACTION_DOWN) {
+ if (me.getAction() == MotionEvent.ACTION_DOWN) {
lastY = (int) me.getRawY();
}
return gestureScanner.onTouchEvent(me);
@@ -268,7 +268,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
@Override
protected void done(Boolean result) {
- if(result) {
+ if (result) {
onCurrentChanged();
onProgressChanged();
}
@@ -462,7 +462,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
albumArtImageView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if(overlayHeight == -1 || lastY < (view.getBottom() - overlayHeight)) {
+ if (overlayHeight == -1 || lastY < (view.getBottom() - overlayHeight)) {
toggleFullscreenAlbumArt();
setControlsVisible(true);
}
@@ -470,35 +470,35 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
});
progressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
- @Override
- public void onStopTrackingTouch(final SeekBar seekBar) {
- new SilentBackgroundTask<Void>(context) {
- @Override
- protected Void doInBackground() throws Throwable {
- getDownloadService().seekTo(progressBar.getProgress());
- return null;
- }
-
- @Override
- protected void done(Void result) {
- seekInProgress = false;
- NowPlayingFragment.this.onProgressChanged();
- }
- }.execute();
- }
-
- @Override
- public void onStartTrackingTouch(final SeekBar seekBar) {
+ @Override
+ public void onStopTrackingTouch(final SeekBar seekBar) {
+ new SilentBackgroundTask<Void>(context) {
+ @Override
+ protected Void doInBackground() throws Throwable {
+ getDownloadService().seekTo(progressBar.getProgress());
+ return null;
+ }
+
+ @Override
+ protected void done(Void result) {
+ seekInProgress = false;
+ NowPlayingFragment.this.onProgressChanged();
+ }
+ }.execute();
+ }
+
+ @Override
+ public void onStartTrackingTouch(final SeekBar seekBar) {
seekInProgress = true;
- }
+ }
- @Override
- public void onProgressChanged(final SeekBar seekBar, final int position, final boolean fromUser) {
+ @Override
+ public void onProgressChanged(final SeekBar seekBar, final int position, final boolean fromUser) {
if (fromUser) {
Util.toast(context, Util.formatDuration(position / 1000), true);
setControlsVisible(true);
}
- }
+ }
});
playlistView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
@@ -1309,8 +1309,12 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
switch (playerState) {
case DOWNLOADING:
if(currentPlaying != null) {
- long bytes = currentPlaying.getPartialFile().length();
- statusTextView.setText(context.getResources().getString(R.string.download_playerstate_downloading, Util.formatLocalizedBytes(bytes, context)));
+ if(Util.isWifiRequiredForDownload(context)) {
+ statusTextView.setText(context.getResources().getString(R.string.download_playerstate_mobile_disabled));
+ } else {
+ long bytes = currentPlaying.getPartialFile().length();
+ statusTextView.setText(context.getResources().getString(R.string.download_playerstate_downloading, Util.formatLocalizedBytes(bytes, context)));
+ }
}
break;
case PREPARING:
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java
index 75d8d5dd..032facd6 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -1023,7 +1023,7 @@ public final class Util {
return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
}
- private static boolean isWifiRequiredForDownload(Context context) {
+ public static boolean isWifiRequiredForDownload(Context context) {
SharedPreferences prefs = getPreferences(context);
return prefs.getBoolean(Constants.PREFERENCES_KEY_WIFI_REQUIRED_FOR_DOWNLOAD, false);
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b897cad6..8544c6e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,6 +183,7 @@
<string name="download.empty">Playlist is empty</string>
<string name="download.shuffle_loading">Shuffle list is loading...</string>
<string name="download.playerstate_downloading">Downloading - %s</string>
+ <string name="download.playerstate_mobile_disabled">Waiting for WiFi network to download</string>
<string name="download.playerstate_buffering">Buffering</string>
<string name="download.playerstate_playing_shuffle">Playing shuffle</string>
<string name="download.menu_show_album">Show Album</string>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 23:10:23 +0000