diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2018-08-17 18:16:03 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2018-08-17 18:16:03 -0700 |
| commit | bdf560352c24e58a371ed878cb96105b69c347b5 (patch) | |
| tree | ebcbaa5eb06245e5a48d93caf6a80db5ad2fbf42 /app/src/main/java/github/daneren2005/dsub/util | |
| parent | c09258017d0523a769b2b4de5e703b5a3b2ba50a (diff) | |
| download | dsub-bdf560352c24e58a371ed878cb96105b69c347b5.tar.gz dsub-bdf560352c24e58a371ed878cb96105b69c347b5.tar.bz2 dsub-bdf560352c24e58a371ed878cb96105b69c347b5.zip | |
Fixes #872 use native serialization so Auto doesn't crash on entries
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/Constants.java | 1 | ||||
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Constants.java b/app/src/main/java/github/daneren2005/dsub/util/Constants.java index e0a1e164..7f5ff3f1 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Constants.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Constants.java @@ -68,6 +68,7 @@ public final class Constants { public static final String INTENT_EXTRA_SHOW_ALL = "showAll"; public static final String INTENT_EXTRA_PLAY_LAST = "playLast"; public static final String INTENT_EXTRA_ENTRY = "passedEntry"; + public static final String INTENT_EXTRA_ENTRY_BYTES = "passedEntryBytes"; // Preferences keys. public static final String PREFERENCES_KEY_SERVER_KEY = "server"; diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java index 816a071d..9f1d5ebd 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java +++ b/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java @@ -39,6 +39,7 @@ import android.support.v7.media.MediaRouter; import android.util.Log; import android.view.KeyEvent; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -584,6 +585,13 @@ public class RemoteControlClientLP extends RemoteControlClientBase { boolean shuffle = extras.getBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE, false); boolean playLast = extras.getBoolean(Constants.INTENT_EXTRA_PLAY_LAST, false); Entry entry = (Entry) extras.getSerializable(Constants.INTENT_EXTRA_ENTRY); + if(extras.containsKey(Constants.INTENT_EXTRA_ENTRY_BYTES)) { + try { + entry = Entry.fromByteArray(extras.getByteArray(Constants.INTENT_EXTRA_ENTRY_BYTES)); + } catch(Exception e) { + Log.e(TAG, "Failed to deserialize from entry: ", e); + } + } String playlistId = extras.getString(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID, null); if(playlistId != null) { |