From 9501ca530dfbe3f97917c5488167d20518492c24 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 7 Jul 2014 10:38:11 -0700 Subject: Just refresh data by default, use serialization if fails --- src/github/daneren2005/dsub/service/CachedMusicService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index bd43fbed..31280b19 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -511,13 +511,15 @@ public class CachedMusicService implements MusicService { public User getUser(boolean refresh, String username, Context context, ProgressListener progressListener) throws Exception { User result = null; - if(!refresh) { - result = FileUtil.deserialize(context, getCacheName(context, "user-" + username), User.class); - } - - if(result == null) { + try { result = musicService.getUser(refresh, username, context, progressListener); FileUtil.serialize(context, result, getCacheName(context, "user-" + username)); + } catch(Exception e) { + // Don't care + } + + if(result == null && !refresh) { + result = FileUtil.deserialize(context, getCacheName(context, "user-" + username), User.class); } return result; -- cgit v1.2.3