Skip to content

X
xabber-android
Commit 76187c1b authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Google Android SDK and support libraries updated to version 23. 

WLMManager removed, DummyCursor overrides new method setExtras.
parent 97910d64
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 215 deletions
app/build.gradle
View file @ 76187c1b
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 22 targetSdkVersion 23
versionCode 214 versionCode 214
versionName '1.0.41' versionName '1.0.41'
} }
...@@ -55,9 +55,9 @@ ext { ...@@ -55,9 +55,9 @@ ext {
} }
dependencies { dependencies {
compile 'com.android.support:design:22.2.1' compile 'com.android.support:design:23.0.0'
compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:appcompat-v7:23.0'
compile 'com.android.support:support-v13:22.2.1' compile 'com.android.support:support-v13:23.0.0'
compile 'com.github.ksoichiro:android-observablescrollview:1.5.0' compile 'com.github.ksoichiro:android-observablescrollview:1.5.0'
compile 'de.hdodenhof:circleimageview:1.2.2' compile 'de.hdodenhof:circleimageview:1.2.2'
compile 'com.melnykov:floatingactionbutton:1.2.0' compile 'com.melnykov:floatingactionbutton:1.2.0'
......
app/src/main/java/com/xabber/android/data/account/WLMManager.java deleted 100644 → 0
View file @ 97910d64
/**
* Copyright (c) 2013, Redsolution LTD. All rights reserved.
*
* This file is part of Xabber project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License, Version 3.
*
* Xabber is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License,
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package com.xabber.android.data.account;
import android.net.Uri;
import com.xabber.android.R;
import com.xabber.android.data.Application;
import com.xabber.android.data.LogManager;
import com.xabber.android.data.NetworkException;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.ParseException;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.EntityUtils;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
class WLMManager implements OAuthProvider {
private static final String WLM_CLIENT_SECRET = "XEazfSKu0Iu2pt6Z64Lqm-1cRxtEYgS0";
private static final String WLM_CLIENT_ID = "00000000440923FF";
private static final String WLM_SCOPE = "wl.messenger wl.offline_access";
private static final String WLM_SCHEME = "https";
private static final String WLM_AUTHORITY = "oauth.live.com";
private static final String WLM_REDIRECT_PATH = "/desktop";
private static final String WLM_REDIRECT_URL = new Uri.Builder()
.scheme(WLM_SCHEME).authority(WLM_AUTHORITY)
.path(WLM_REDIRECT_PATH).build().toString();
private final static WLMManager instance;
static {
instance = new WLMManager();
Application.getInstance().addManager(instance);
}
private WLMManager() {
}
public static WLMManager getInstance() {
return instance;
}
/**
* @param protocol
* @param grantType
* @param value
* @return Access and refresh tokens or <code>null</code> if auth failed.
* @throws NetworkException
*/
private OAuthResult accessTokenOperation(GrantType grantType, String value)
throws NetworkException {
HttpPost httpPost = new HttpPost(new Uri.Builder().scheme(WLM_SCHEME)
.authority(WLM_AUTHORITY).path("token").build().toString());
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>();
nameValuePairs
.add(new BasicNameValuePair("grant_type", grantType.name));
nameValuePairs.add(new BasicNameValuePair(grantType.value, value));
nameValuePairs.add(new BasicNameValuePair("redirect_uri",
WLM_REDIRECT_URL));
nameValuePairs.add(new BasicNameValuePair("client_id", WLM_CLIENT_ID));
nameValuePairs.add(new BasicNameValuePair("client_secret",
WLM_CLIENT_SECRET));
UrlEncodedFormEntity encodedFormEntity;
try {
encodedFormEntity = new UrlEncodedFormEntity(nameValuePairs,
HTTP.UTF_8);
} catch (UnsupportedEncodingException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
}
String content;
try {
content = EntityUtils.toString(encodedFormEntity);
} catch (ParseException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
} catch (IOException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
}
LogManager.i(this, httpPost.getURI().toString() + "\n" + content);
httpPost.setEntity(encodedFormEntity);
HttpClient httpClient = new DefaultHttpClient();
HttpResponse httpResponse;
try {
httpResponse = httpClient.execute(httpPost);
} catch (ClientProtocolException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
} catch (IOException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
}
HttpEntity entity = httpResponse.getEntity();
try {
content = EntityUtils.toString(entity);
} catch (ParseException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
} catch (IOException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
} finally {
try {
entity.consumeContent();
} catch (IOException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
}
}
LogManager.i(this, content);
long expiresIn;
String accessToken;
String refreshToken;
try {
JSONObject jsonObject = (JSONObject) new JSONTokener(content)
.nextValue();
if (jsonObject.has("error"))
return null;
try {
expiresIn = Long.valueOf(jsonObject.getString("expires_in")) * 1000;
} catch (NumberFormatException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
}
accessToken = jsonObject.getString("access_token");
refreshToken = jsonObject.getString("refresh_token");
} catch (JSONException e) {
throw new NetworkException(R.string.CONNECTION_FAILED, e);
}
return new OAuthResult(accessToken, refreshToken, expiresIn);
}
@Override
public AccountProtocol getAccountProtocol() {
return AccountProtocol.wlm;
}
@Override
public String requestRefreshToken(String code) throws NetworkException {
OAuthResult result = accessTokenOperation(GrantType.authorizationCode,
code);
if (result == null)
return null;
else
return result.getRefreshToken();
}
@Override
public OAuthResult requestAccessToken(String refreshToken)
throws NetworkException {
return accessTokenOperation(GrantType.refreshToken, refreshToken);
}
@Override
public String getUrl() {
return new Uri.Builder().scheme(WLM_SCHEME).authority(WLM_AUTHORITY)
.path("authorize")
.appendQueryParameter("response_type", "code")
.appendQueryParameter("client_id", WLM_CLIENT_ID)
.appendQueryParameter("redirect_uri", WLM_REDIRECT_URL)
.appendQueryParameter("scope", WLM_SCOPE)
.appendQueryParameter("display", "touch").build().toString();
}
@Override
public boolean isValidUri(Uri uri) {
return WLM_SCHEME.equals(uri.getScheme())
&& WLM_AUTHORITY.equals(uri.getAuthority())
&& WLM_REDIRECT_PATH.equals(uri.getPath());
}
private enum GrantType {
authorizationCode("authorization_code", "code"),
refreshToken("refresh_token", "refresh_token");
public final String name;
public final String value;
GrantType(String name, String value) {
this.name = name;
this.value = value;
}
}
}
app/src/main/java/com/xabber/android/utils/DummyCursor.java
View file @ 76187c1b
...@@ -204,6 +204,10 @@ public class DummyCursor implements Cursor { ...@@ -204,6 +204,10 @@ public class DummyCursor implements Cursor {
return false; return false;
} }
@Override
public void setExtras(Bundle extras) {
}
@Override @Override
public Bundle getExtras() { public Bundle getExtras() {
return null; return null;
......
app/src/main/res/values/preferences.xml
View file @ 76187c1b
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
<item>com.xabber.android.data.extension.cs.ChatStateManager</item> <item>com.xabber.android.data.extension.cs.ChatStateManager</item>
<item>com.xabber.android.data.connection.NetworkManager</item> <item>com.xabber.android.data.connection.NetworkManager</item>
<item>com.xabber.android.data.account.OAuthManager</item> <item>com.xabber.android.data.account.OAuthManager</item>
<item>com.xabber.android.data.account.WLMManager</item>
<item>com.xabber.android.data.roster.SyncManager</item> <item>com.xabber.android.data.roster.SyncManager</item>
<item>com.xabber.android.data.connection.DNSManager</item> <item>com.xabber.android.data.connection.DNSManager</item>
<item>com.xabber.android.data.connection.CertificateManager</item> <item>com.xabber.android.data.connection.CertificateManager</item>
...@@ -434,7 +433,7 @@ ...@@ -434,7 +433,7 @@
<item>@string/account_archive_mode_dont_store</item> <item>@string/account_archive_mode_dont_store</item>
</string-array> </string-array>
<string name="account_archive_mode_default_value">available</string> <string name="account_archive_mode_default_value">local</string>
<!-- preference_security --> <!-- preference_security -->
<string name="security_check_certificate_key">security_check_certificate</string> <string name="security_check_certificate_key">security_check_certificate</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023