Ubuntu One Android Music

Merge lp:~cmiller/ubuntuone-android-music/oops-there-was-a-problem into lp:ubuntuone-android-music

  1. oops-there-was-a-problem
  2. Merge into trunk
Proposed by Chad Miller
Status: Merged
Merged at revision: 560
Proposed branch: lp:~cmiller/ubuntuone-android-music/oops-there-was-a-problem
Merge into: lp:ubuntuone-android-music
Diff against target: 29 lines (+5/-1)
2 files modified
res/values/strings.xml (+1/-0)
src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java (+4/-1)
To merge this branch: bzr merge lp:~cmiller/ubuntuone-android-music/oops-there-was-a-problem
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+90151@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michał Karnicki (karni) wrote :

Subsonic code uses spaces to indent.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'res/values/strings.xml'
2--- res/values/strings.xml 2011-11-03 22:57:59 +0000
3+++ res/values/strings.xml 2012-01-25 16:58:23 +0000
4@@ -36,6 +36,7 @@
5 <string name="main.menu_log_in_label">Log in</string>
6 <string name="main.menu_exit_label">Exit</string>
7 <string name="main_menu_demo_music.label">About demo music</string>
8+ <string name="main.auth_error">Credentials problem. Please retry again soon.</string>
9
10 <string name="authconfirm.title">Successfully signed in</string>
11 <string name="authconfirm.text">Welcome to Ubuntu One Music! You will immediately see all your music, but it will take a little while
12
13=== modified file 'src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java'
14--- src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java 2011-11-03 13:17:38 +0000
15+++ src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java 2012-01-25 16:58:23 +0000
16@@ -230,9 +230,12 @@
17 updateActiveServerName();
18 } else if (resultCode == LoginActivity.RESULT_AUTH_ERROR) {
19 // There was an error while authenticating.
20- Util.toast(this, "Oops, something went wrong.");
21+ Util.toast(this, R.string.main_auth_error);
22 if (data != null) {
23 String error = data.getStringExtra("error");
24+ if (error != null) {
25+ Util.toast(this, error);
26+ }
27 if (error != null) {
28 tracker.trackEvent("Errors", TAG, error, 1);
29 }

Subscribers

People subscribed via source and target branches

to status/vote changes: