tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

All smart playlists are working now.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-06-21 21:17:22 +02:00
commit 50f73c1dde
19 changed files with 1019 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumImageUrlLoader.java
View file

@ -18,7 +18,7 @@ public class LastFMAlbumImageUrlLoader {
public static void loadAlbumImageUrl(Context context, String queryAlbum, String queryArtist, final AlbumImageUrlLoaderCallback callback) {
if (queryAlbum != null) {
String albumJSON = AlbumJSONStore.getInstance(context).getAlbumJSON(queryAlbum + queryArtist);
String albumJSON = AlbumJSONStore.getInstance(context).getJSONData(queryAlbum + queryArtist);
if (albumJSON != null) {
try {
loadAlbumImageUrlFromJSON(new JSONObject(albumJSON), callback);

8
app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumInfoUtil.java
View file

@ -45,7 +45,7 @@ public class LastFMAlbumInfoUtil {
try {
return rootJSON.getJSONObject("album").getString("name");
} catch (JSONException e) {
//Log.e(TAG, "Error while getting album name from JSON parameter!", e);
//Log.e(TAG, "Error while getting album name from JSON_DATA parameter!", e);
return "";
}
}
@ -60,7 +60,7 @@ public class LastFMAlbumInfoUtil {
}
return images.getJSONObject(0).getString("#text");
} catch (JSONException | NullPointerException e) {
//Log.e(TAG, "Error while getting album thumbnail image from JSON parameter!", e);
//Log.e(TAG, "Error while getting album thumbnail image from JSON_DATA parameter!", e);
return "";
}
}
@ -69,7 +69,7 @@ public class LastFMAlbumInfoUtil {
try {
return rootJSON.getJSONObject("album").getJSONArray("image");
} catch (JSONException e) {
//Log.e(TAG, "Error while getting album image array from JSON parameter!", e);
//Log.e(TAG, "Error while getting album image array from JSON_DATA parameter!", e);
return null;
}
}
@ -79,7 +79,7 @@ public class LastFMAlbumInfoUtil {
JSONArray images = getAlbumImageArrayFromJSON(rootJSON);
return images.getJSONObject(images.length() - 1).getString("#text");
} catch (JSONException | NullPointerException e) {
//Log.e(TAG, "Error while getting album image from JSON parameter!", e);
//Log.e(TAG, "Error while getting album image from JSON_DATA parameter!", e);
return "";
}
}

12
app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistInfoUtil.java
View file

@ -45,7 +45,7 @@ public class LastFMArtistInfoUtil {
try {
return rootJSON.getJSONObject("artist").getString("name");
} catch (JSONException e) {
//Log.e(TAG, "Error while getting artist name from JSON parameter!", e);
//Log.e(TAG, "Error while getting artist name from JSON_DATA parameter!", e);
return "";
}
}
@ -60,7 +60,7 @@ public class LastFMArtistInfoUtil {
}
return images.getJSONObject(0).getString("#text");
} catch (JSONException | NullPointerException e) {
//Log.e(TAG, "Error while getting artist thumbnail image from JSON parameter!", e);
//Log.e(TAG, "Error while getting artist thumbnail image from JSON_DATA parameter!", e);
return "";
}
}
@ -69,7 +69,7 @@ public class LastFMArtistInfoUtil {
try {
return rootJSON.getJSONObject("artist").getJSONArray("image");
} catch (JSONException e) {
//Log.e(TAG, "Error while getting artist image array from JSON parameter!", e);
//Log.e(TAG, "Error while getting artist image array from JSON_DATA parameter!", e);
return null;
}
}
@ -79,7 +79,7 @@ public class LastFMArtistInfoUtil {
JSONArray images = getArtistImageArrayFromJSON(rootJSON);
return images.getJSONObject(images.length() - 1).getString("#text");
} catch (JSONException | NullPointerException e) {
//Log.e(TAG, "Error while getting artist image from JSON parameter!", e);
//Log.e(TAG, "Error while getting artist image from JSON_DATA parameter!", e);
return "";
}
}
@ -88,13 +88,13 @@ public class LastFMArtistInfoUtil {
try {
return rootJSON.getJSONObject("artist").getJSONObject("bio").getString("content");
} catch (JSONException e) {
//Log.e(TAG, "Error while getting artist biography from JSON parameter!", e);
//Log.e(TAG, "Error while getting artist biography from JSON_DATA parameter!", e);
return "";
}
}
public static void saveArtistJSONDataToCacheAndDisk(Context context, String artist, JSONObject jsonObject) {
ArtistJSONStore.getInstance(context).removeItem(artist);
ArtistJSONStore.getInstance(context).removeArtistJSON(artist);
ArtistJSONStore.getInstance(context).addArtistJSON(artist, jsonObject.toString());
}