projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #152 from owncloud/oauth_login
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
LandingActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/LandingActivity.java
b/src/com/owncloud/android/ui/activity/LandingActivity.java
index
7ae0e00
..
8540bb2
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/
src/com/owncloud/android/ui/activity/LandingActivity.java
@@
-17,7
+17,7
@@
package com.owncloud.android.ui.activity;
\r
\r
import com.actionbarsherlock.app.SherlockFragmentActivity;
\r
package com.owncloud.android.ui.activity;
\r
\r
import com.actionbarsherlock.app.SherlockFragmentActivity;
\r
-import com.owncloud.android.authenticat
or
.AccountAuthenticator;
\r
+import com.owncloud.android.authenticat
ion
.AccountAuthenticator;
\r
import com.owncloud.android.ui.adapter.LandingScreenAdapter;
\r
\r
import android.accounts.Account;
\r
import com.owncloud.android.ui.adapter.LandingScreenAdapter;
\r
\r
import android.accounts.Account;
\r
@@
-112,9
+112,9
@@
public class LandingActivity extends SherlockFragmentActivity implements
dialog.dismiss();
\r
switch (which) {
\r
case DialogInterface.BUTTON_POSITIVE:
\r
dialog.dismiss();
\r
switch (which) {
\r
case DialogInterface.BUTTON_POSITIVE:
\r
- Intent intent = new Intent(
"android.settings.ADD_ACCOUNT_SETTINGS"
);
\r
+ Intent intent = new Intent(
android.provider.Settings.ACTION_ADD_ACCOUNT
);
\r
intent.putExtra("authorities",
\r
intent.putExtra("authorities",
\r
- new String[] { AccountAuthenticator.AUTH
_TOKEN_TYPE
});
\r
+ new String[] { AccountAuthenticator.AUTH
ORITY
});
\r
startActivity(intent);
\r
break;
\r
case DialogInterface.BUTTON_NEGATIVE:
\r
startActivity(intent);
\r
break;
\r
case DialogInterface.BUTTON_NEGATIVE:
\r