Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON API update -RPC Protocol Broken #3

Open
wants to merge 104 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
cb085cf
Updates of old ide stuff to new working order
May 13, 2012
3e055aa
Fixed the project name
May 14, 2012
5dc2cfa
Attempting to update to Json
May 14, 2012
7ce3c5f
Readme changes to reflect a group effort
May 15, 2012
23c6179
Old key removal
May 15, 2012
3133be8
Readme warning as to the broken functionality
May 15, 2012
4359672
Renames from Pandoid to Pandoroid (the project's official name)
May 18, 2012
e027cb5
All renaming completed (hopefully)
May 19, 2012
d5fa53a
Implemented an RPC class
May 25, 2012
4d87f01
Significant changes made to the API towards a JSON interface
May 31, 2012
aaa08cf
Final API bugs fixed
May 31, 2012
da00420
Significant cleanup made
May 31, 2012
96d128f
Readme updated
May 31, 2012
bc00cea
Upped the versioning to 0.3
May 31, 2012
f3eba7d
Initial login bug fix
Jun 1, 2012
9d7d37d
Fixed a couple of fatal errors...still buggy as hell
Jun 1, 2012
8e35db4
Fix logon issue
Tortel Jun 3, 2012
e403013
Clean up layouts
Tortel Jun 3, 2012
1762ea2
Add files in preperation for UI overhaul
Tortel Jun 3, 2012
c4ec7be
Starting to re-work the UI.
Tortel Jun 3, 2012
8db900f
UI update
Tortel Jun 4, 2012
b3ba534
More UI changes
Tortel Jun 5, 2012
049b296
Generic code updates
Jun 5, 2012
fb06bfd
API changed to use the desktop AIR client credentials. Those without …
Jun 6, 2012
c76b258
Readme edit
Jun 6, 2012
b30128d
Readme style edit
Jun 6, 2012
384f043
Readme style edit
Jun 6, 2012
e90f065
Finally working on ICS
Tortel Jun 6, 2012
fc6fdfb
Lots of cleanup
Tortel Jun 7, 2012
51972c1
New button images
Tortel Jun 9, 2012
c79474c
Change to a different package
Tortel Jun 9, 2012
c61000e
Add an about dialog
Tortel Jun 10, 2012
f7c0912
Starting to re-write most of the code
Tortel Jun 24, 2012
12dbf5d
Clean up preferences
Tortel Jun 25, 2012
51c33e4
Moved getting the next song into its own AsyncTask
Tortel Jun 25, 2012
abd75d3
Re-enable StrictMode
Tortel Jun 25, 2012
8e52519
New onResume(), so itt will re-display information for the current song
Tortel Jun 25, 2012
0b465ad
Short merge
dylanPowers Jun 25, 2012
c03886d
Remove the last disable StrictMode
Tortel Jun 26, 2012
7931c95
Fix crash on 5th song
Tortel Jun 26, 2012
ea862d4
Update Readme with ActionBarSherlock information
Tortel Jun 26, 2012
1f82f18
Package rename to com.pandoroid
Tortel Jun 26, 2012
648a0f7
Environment config
dylanPowers Jun 26, 2012
efec78a
Cool new UI features among some bug fixes merged from #2
dylanPowers Jun 26, 2012
5b2d982
Credential behavior has been changed to auto detect the user to allow…
dylanPowers Jun 27, 2012
49374c5
Song feedback implemented! And extensive error codes added.
dylanPowers Jun 27, 2012
6927d2c
Small code refactor in the signIn() function
dylanPowers Jun 27, 2012
966c2ce
Readme updated
dylanPowers Jul 2, 2012
eed1842
Improved audio URL and codec information for Songs.
dylanPowers Jul 6, 2012
1d5e569
More RPCException error codes and greater documentation.
dylanPowers Jul 6, 2012
d0d70e0
General stability improvements
dylanPowers Jul 7, 2012
46d7dd5
Completely new playback engine in anticipation for the dynamic/contin…
dylanPowers Jul 9, 2012
c7dd86f
Station switching fixed
dylanPowers Jul 10, 2012
21fa937
Fixed notification issue
dylanPowers Jul 10, 2012
f70b65c
Code cleanup, documentation, and licensing updates.
dylanPowers Jul 10, 2012
bbae280
Bug fix for getting another playlist
dylanPowers Jul 10, 2012
d4f5bb6
Bug fix for a crash when switching off of wifi
dylanPowers Jul 10, 2012
e57a3b7
New playback package
dylanPowers Jul 12, 2012
3ced529
New halt state codes and some new documentation for the media playbac…
dylanPowers Jul 12, 2012
f569478
Repaired incorrect service and activity implementations
dylanPowers Jul 13, 2012
23706c5
Small changes to the service binding implementation.
dylanPowers Jul 13, 2012
0542d8d
New feature: Force 4 position rotation.
dylanPowers Jul 13, 2012
8aa60fe
Service onDestroy() implemented
dylanPowers Jul 13, 2012
30b952f
Fix for a notification incorrectly popping up.
dylanPowers Jul 13, 2012
75e8965
Fixed/hacked back the listener setting
dylanPowers Jul 14, 2012
b49384c
Quick hack for the song info not automatically updating
dylanPowers Jul 16, 2012
3d0f112
Long term fix for the song info updating.
dylanPowers Jul 16, 2012
cfa7e28
Merge branch 'fix-stupid-service-stuff' into dynamic-downloader
dylanPowers Jul 16, 2012
e043cee
Playback listener updates
dylanPowers Jul 16, 2012
09f4265
More robust error handling for the remote procedure calls.
dylanPowers Jul 16, 2012
09ab462
Oh look! A class for estimating available bandwidth.
dylanPowers Jul 18, 2012
15fb2f0
Variable quality and continuous playback are working
dylanPowers Jul 21, 2012
261bd61
Some small changes
dylanPowers Jul 23, 2012
0bd54ff
Better, more proper, and simplified thread safety implementation, and…
dylanPowers Jul 25, 2012
ba7027a
A playback hanging issue has been fixed.
dylanPowers Jul 26, 2012
09a7421
Fixes playback start after a phone call.
dylanPowers Jul 26, 2012
ba94708
Code cleanup, minor tweaks, and documentation.
dylanPowers Jul 31, 2012
8986fbf
The package has now been streamlined to com.pandoroid;
dylanPowers Jul 31, 2012
fabb3d9
Python remnants removed.
dylanPowers Jul 31, 2012
1a3c71c
Whoops! A fix for the cached song being skipped.
dylanPowers Aug 1, 2012
ee04495
Removed the gen/ directory from version control
dylanPowers Aug 1, 2012
5cae7dd
Repairs a MediaPlaybackController crash and tweaks the cached player.
dylanPowers Aug 2, 2012
9ea5492
Null pointer fix for the buffering
dylanPowers Aug 3, 2012
b9ae145
New GUI that gives error messages and streamlines the login process.
dylanPowers Aug 9, 2012
8aa317a
More debugging information for the logs
dylanPowers Aug 13, 2012
eb06aea
Tweaked bandwidth estimation
dylanPowers Aug 13, 2012
c56eeb9
Visual cues for why the music has stopped
dylanPowers Aug 19, 2012
98a0f93
Repaired song rating implementation.
dylanPowers Aug 19, 2012
82f357b
Pausing on headphone disconnect (AUDIO_BECOMING_NOISY).
dylanPowers Aug 21, 2012
1f911a9
Small performance optimization.
dylanPowers Aug 26, 2012
b21f51e
Hack to fix some improper bitrate calculations.
dylanPowers Aug 27, 2012
a0d5196
Repairs authentication token and song expirations
dylanPowers Aug 27, 2012
5bc50bb
MediaPlayback algorithm enhancements.
dylanPowers Aug 27, 2012
895b0ad
Playback fixes.
dylanPowers Sep 1, 2012
dce4201
About dialog update
dylanPowers Sep 1, 2012
d88a4d0
Readme update and version bump to 1.0.0-Pre-8
dylanPowers Sep 1, 2012
6cb12af
Turbo download mode optimization
dylanPowers Sep 5, 2012
87a4616
Readme update
dylanPowers Sep 5, 2012
b7223d2
Fixed a force close caused by a stray dialog
dylanPowers Sep 8, 2012
0a8cc03
Hack to fix the lack of buffering updates
dylanPowers Sep 23, 2012
e9335fd
Turbo mode trigger reduced to 2
dylanPowers Sep 26, 2012
34b7941
Reconfiguring the ActionBarSherlock library as a git submodule.
dylanPowers Nov 12, 2012
ddef8bb
Updated a few string values
dylanPowers Nov 20, 2012
6eed996
Increased logging information
dylanPowers Nov 20, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Initial login bug fix
Dylan Powers committed Jun 1, 2012

Verified

This commit was signed with the committer’s verified signature. The key has expired.
miri64 Martine Lenders
commit f3eba7dc33efe350aaaa8edcade9965fa474c035
10 changes: 5 additions & 5 deletions .project
Original file line number Diff line number Diff line change
@@ -6,27 +6,27 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
2 changes: 1 addition & 1 deletion src/com/aregner/android/pandoroid/PandoraRadioService.java
Original file line number Diff line number Diff line change
@@ -311,7 +311,7 @@ public void pause() {
}
public Song next() {
// play the next song in the current list
if(++currentSongIndex < currentPlaylist.length) {
if(currentPlaylist != null && (++currentSongIndex < currentPlaylist.length)) {
prepare(currentSongIndex);

// prepare the next playlist if we are nearing the end
2 changes: 1 addition & 1 deletion src/com/aregner/android/pandoroid/PandoroidLogin.java
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ public void onClick(View viewParam) {
setResult(RESULT_OK);
finish();
//finishActivityFromChild(child, PandoidPlayer.REQUIRE_LOGIN_CREDS);
//finishActivity(PandoidPlayer.REQUIRE_LOGIN_CREDS);
//finishActivity(PandoroidPlayer.REQUIRE_LOGIN_CREDS);
}
}
}
4 changes: 3 additions & 1 deletion src/com/aregner/android/pandoroid/PandoroidPlayer.java
Original file line number Diff line number Diff line change
@@ -193,7 +193,9 @@ protected Boolean doInBackground(Void... arg) {
String password = prefs.getString("pandora_password", null);

try {
pandora.signIn(username, password);
if (username != null && password != null){
pandora.signIn(username, password);
}
} catch(Exception ex) {
ex.printStackTrace();
}