Merge lp://staging/~karni/ubuntuone-android-files/automate-sso into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 188 |
| Merged at revision: | 188 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/automate-sso |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
419 lines (+56/-185) 4 files modified
res/layout/activity_login.xml (+3/-24) src/com/ubuntuone/android/files/ui/FilesActivity.java (+18/-5) src/com/ubuntuone/android/files/ui/LoginActivity.java (+35/-153) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+0/-3) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/automate-sso |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch:
- Puts getAuthToken() call in onResume of LoginActivity, so we call SSO automatically, without need for user interation (known side effect: can't leave SSO with back button)
- Removes old oauth browser dance code
- Avoids nasty killProcess call. Instead, verify presence of tokens in onResume of FilesActivity as well. It's not heavy, and far more elegant.
To post a comment you must log in.
Revision history for this message
| Chad Miller (cmiller) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
