Merge lp://staging/~karni/ubuntuone-android-files/purchase-and-sso into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Merged at revision: | 226 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/purchase-and-sso |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
1606 lines (+459/-730) 18 files modified
AndroidManifest.xml.in (+21/-24) res/layout/activity_authproxy.xml (+75/-0) res/layout/activity_login.xml (+0/-50) res/menu/options_menu_login.xml (+0/-9) res/values/colors.xml (+2/-0) res/values/strings.xml (+9/-12) src/com/ubuntuone/android/files/AuthProxy.java (+129/-0) src/com/ubuntuone/android/files/Preferences.java (+29/-49) src/com/ubuntuone/android/files/UbuntuOneFiles.java (+1/-13) src/com/ubuntuone/android/files/service/MetaService.java (+2/-1) src/com/ubuntuone/android/files/service/UpDownService.java (+2/-2) src/com/ubuntuone/android/files/ui/FilesActivity.java (+20/-27) src/com/ubuntuone/android/files/ui/LoginActivity.java (+24/-215) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+29/-23) src/com/ubuntuone/android/files/ui/StoreActivity.java (+33/-20) src/com/ubuntuone/android/files/util/Authorizer.java (+43/-0) src/com/ubuntuone/android/files/util/HttpManager.java (+40/-0) src/com/ubuntuone/android/files/util/OAuthUtilities.java (+0/-285) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/purchase-and-sso |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Use the serialized token from AccountManager, which contains actual consumer_key and consumer_secret instead of ubuntuone/
Add AuthProxy activity to authorize other apps to use our OAuth token.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
"Following application is requesting" sounds funny. "The Following" or "This" or something would be better.