X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dc8c32fb3f7033d6fdfa7e1b64eaa77884da678a..635fcd3e281e81b4632b92b161718c21be9c5e46:/src/eu/alefzero/owncloud/authenticator/AuthUtils.java diff --git a/src/eu/alefzero/owncloud/authenticator/AuthUtils.java b/src/eu/alefzero/owncloud/authenticator/AuthUtils.java index 7e6c813d..e3fc32c4 100644 --- a/src/eu/alefzero/owncloud/authenticator/AuthUtils.java +++ b/src/eu/alefzero/owncloud/authenticator/AuthUtils.java @@ -22,25 +22,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; -import java.security.KeyManagementException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.security.UnrecoverableKeyException; - -import javax.net.SocketFactory; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import javax.security.cert.CertificateException; -import javax.security.cert.X509Certificate; - -import org.apache.http.client.HttpClient; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; @@ -58,8 +39,6 @@ import org.apache.http.client.methods.HttpHead; import org.apache.http.conn.params.ConnManagerPNames; import org.apache.http.conn.params.ConnPerRouteBean; import org.apache.http.conn.scheme.PlainSocketFactory; -import org.apache.http.conn.ssl.SSLSocketFactory; -import org.apache.http.impl.conn.SingleClientConnManager; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; @@ -69,8 +48,12 @@ import org.apache.http.protocol.BasicHttpContext; import eu.alefzero.owncloud.ui.activity.AuthenticatorActivity; +import android.accounts.Account; +import android.accounts.AccountManager; import android.content.Context; +import android.content.SharedPreferences; import android.os.Handler; +import android.preference.PreferenceManager; import android.util.Log; public class AuthUtils { @@ -240,4 +223,29 @@ public class AuthUtils { }; return performOnBackgroundThread(r); } + + /** + * Can be used to get the currently selected ownCloud account in the preferences + * + * @param context The current appContext + * @return The current account or null, if there is none yet. + */ + public static Account getCurrentOwnCloudAccount(Context context){ + Account[] ocAccounts = AccountManager.get(context).getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE); + Account defaultAccount = null; + + SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context); + String accountName = appPreferences.getString("select_oc_account", null); + + if(accountName != null){ + for(Account account : ocAccounts){ + if(account.name.equals(accountName)){ + defaultAccount = account; + break; + } + } + } + + return defaultAccount; + } }