X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a4ba6170ea7696e085b07adfef73eeb8b77cb8e2..c75e5aa71cf93e677e5abb95cb3d9c1f45a64ea7:/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 ce7ff2f6..45ed279d 100644 --- a/src/com/owncloud/android/ui/activity/LandingActivity.java +++ b/src/com/owncloud/android/ui/activity/LandingActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2011 Bartek Przybylski * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +17,6 @@ package com.owncloud.android.ui.activity; import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.owncloud.android.authenticator.AccountAuthenticator; import com.owncloud.android.ui.adapter.LandingScreenAdapter; import android.accounts.Account; @@ -34,6 +32,8 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.GridView; import android.widget.Toast; + +import com.owncloud.android.MainApp; import com.owncloud.android.R; /** @@ -64,7 +64,7 @@ public class LandingActivity extends SherlockFragmentActivity implements // Start device tracking service Intent locationServiceIntent = new Intent(); locationServiceIntent - .setAction("eu.alefzero.owncloud.location.LocationLauncher"); + .setAction("com.owncloud.android.location.LocationLauncher"); sendBroadcast(locationServiceIntent); } @@ -113,9 +113,9 @@ public class LandingActivity extends SherlockFragmentActivity implements dialog.dismiss(); switch (which) { case DialogInterface.BUTTON_POSITIVE: - Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); + Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT); intent.putExtra("authorities", - new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); + new String[] { MainApp.getAuthTokenType() }); startActivity(intent); break; case DialogInterface.BUTTON_NEGATIVE: @@ -151,7 +151,7 @@ public class LandingActivity extends SherlockFragmentActivity implements private boolean accountsAreSetup() { AccountManager accMan = AccountManager.get(this); Account[] accounts = accMan - .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE); + .getAccountsByType(MainApp.getAccountType()); return accounts.length > 0; }