public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-16 03:06:22 +00:00
Code Issues Releases Wiki Activity

Build against API 23

Browse Source
This commit is contained in:
jendib
2016-01-13 23:27:39 +01:00
parent 83e1191a8a
commit 0f4e5a8f6d
14 changed files with 81 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
View File

@@ -25,7 +25,6 @@ import com.sismics.docs.ui.view.DatePickerView;
import com.sismics.docs.ui.view.TagsCompleteTextView;
import com.sismics.docs.util.PreferenceUtil;
import org.apache.http.Header;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -36,6 +35,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import cz.msebera.android.httpclient.Header;
import de.greenrobot.event.EventBus;
/**

2
docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
View File

@@ -54,7 +54,6 @@ import com.sismics.docs.service.FileUploadService;
import com.sismics.docs.util.PreferenceUtil;
import com.sismics.docs.util.TagUtil;
import org.apache.http.Header;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -63,6 +62,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import cz.msebera.android.httpclient.Header;
import de.greenrobot.event.EventBus;
/**

3
docs-android/app/src/main/java/com/sismics/docs/activity/LoginActivity.java
View File

@@ -22,9 +22,10 @@ import com.sismics.docs.ui.form.validator.Required;
import com.sismics.docs.util.DialogUtil;
import com.sismics.docs.util.PreferenceUtil;
import org.apache.http.Header;
import org.json.JSONObject;
import cz.msebera.android.httpclient.Header;
/**
* Login activity.
*

2
docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java
View File

@@ -31,9 +31,9 @@ import com.sismics.docs.resource.TagResource;
import com.sismics.docs.resource.UserResource;
import com.sismics.docs.util.PreferenceUtil;
import org.apache.http.Header;
import org.json.JSONObject;
import cz.msebera.android.httpclient.Header;
import de.greenrobot.event.EventBus;
/**

2
docs-android/app/src/main/java/com/sismics/docs/fragment/DocListFragment.java
View File

@@ -27,9 +27,9 @@ import com.sismics.docs.resource.DocumentResource;
import com.sismics.docs.ui.view.DividerItemDecoration;
import com.sismics.docs.ui.view.EmptyRecyclerView;
import org.apache.http.Header;
import org.json.JSONObject;
import cz.msebera.android.httpclient.Header;
import de.greenrobot.event.EventBus;
/**

2
docs-android/app/src/main/java/com/sismics/docs/fragment/DocShareFragment.java
View File

@@ -26,10 +26,10 @@ import com.sismics.docs.resource.DocumentResource;
import com.sismics.docs.resource.ShareResource;
import com.sismics.docs.util.PreferenceUtil;
import org.apache.http.Header;
import org.json.JSONArray;
import org.json.JSONObject;
import cz.msebera.android.httpclient.Header;
import de.greenrobot.event.EventBus;
/**

9
docs-android/app/src/main/java/com/sismics/docs/listener/JsonHttpResponseHandler.java
View File

@@ -22,19 +22,20 @@ import android.util.Log;
import com.loopj.android.http.TextHttpResponseHandler;
import org.apache.http.Header;
import org.apache.http.HttpStatus;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
import cz.msebera.android.httpclient.Header;
import cz.msebera.android.httpclient.HttpStatus;
/**
* Used to intercept and handle the responses from requests made using {@link com.loopj.android.http.AsyncHttpClient}, with
* automatic parsing into a {@link JSONObject} or {@link JSONArray}. <p>&nbsp;</p> This class is
* designed to be passed to get, post, put and delete requests with the {@link #onSuccess(int,
* org.apache.http.Header[], org.json.JSONArray)} or {@link #onSuccess(int,
* org.apache.http.Header[], org.json.JSONObject)} methods anonymously overridden. <p>&nbsp;</p>
* cz.msebera.android.httpclient.Header[], org.json.JSONArray)} or {@link #onSuccess(int,
* cz.msebera.android.httpclient.Header[], org.json.JSONObject)} methods anonymously overridden. <p>&nbsp;</p>
* Additionally, you can override the other event methods from the parent class.
*/
public class JsonHttpResponseHandler extends TextHttpResponseHandler {

3
docs-android/app/src/main/java/com/sismics/docs/model/application/ApplicationContext.java
View File

@@ -8,9 +8,10 @@ import com.sismics.docs.listener.JsonHttpResponseHandler;
import com.sismics.docs.resource.UserResource;
import com.sismics.docs.util.PreferenceUtil;
import org.apache.http.Header;
import org.json.JSONObject;
import cz.msebera.android.httpclient.Header;
/**
* Global context of the application.
*

47
docs-android/app/src/main/java/com/sismics/docs/resource/BaseResource.java
View File

@@ -54,10 +54,16 @@ public class BaseResource {
try {
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
trustStore.load(null, null);
// AQuery support only the old Apache HTTP library
MySSLSocketFactory sf = new MySSLSocketFactory(trustStore);
sf.setHostnameVerifier(MySSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
client.setSSLSocketFactory(sf);
AbstractAjaxCallback.setSSF(sf);
// Async HTTP Client uses another HTTP libary
MySSLSocketFactory2 sf2 = new MySSLSocketFactory2(trustStore);
sf2.setHostnameVerifier(MySSLSocketFactory2.ALLOW_ALL_HOSTNAME_VERIFIER);
client.setSSLSocketFactory(sf2);
} catch (Exception e) {
// NOP
}
@@ -84,7 +90,7 @@ public class BaseResource {
}
/**
* Socket factory to allow self-signed certificates.
* Socket factory to allow self-signed certificates for AQuery.
*
* @author bgamard
*/
@@ -119,6 +125,43 @@ public class BaseResource {
return sslContext.getSocketFactory().createSocket();
}
}
/**
* Socket factory to allow self-signed certificates for Async HTTP Client.
*
* @author bgamard
*/
public static class MySSLSocketFactory2 extends cz.msebera.android.httpclient.conn.ssl.SSLSocketFactory {
SSLContext sslContext = SSLContext.getInstance("TLS");
public MySSLSocketFactory2(KeyStore truststore) throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
super(truststore);
TrustManager tm = new X509TrustManager() {
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
public X509Certificate[] getAcceptedIssuers() {
return null;
}
};
sslContext.init(null, new TrustManager[] { tm }, null);
}
@Override
public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException {
return sslContext.getSocketFactory().createSocket(socket, host, port, autoClose);
}
@Override
public Socket createSocket() throws IOException {
return sslContext.getSocketFactory().createSocket();
}
}
/**
* Returns cleaned API URL.

4
docs-android/app/src/main/java/com/sismics/docs/resource/FileResource.java
View File

@@ -58,8 +58,8 @@ public class FileResource extends BaseResource {
SyncHttpClient client = new SyncHttpClient();
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
trustStore.load(null, null);
MySSLSocketFactory sf = new MySSLSocketFactory(trustStore);
sf.setHostnameVerifier(MySSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
MySSLSocketFactory2 sf = new MySSLSocketFactory2(trustStore);
sf.setHostnameVerifier(MySSLSocketFactory2.ALLOW_ALL_HOSTNAME_VERIFIER);
client.setSSLSocketFactory(sf);
client.setCookieStore(new PersistentCookieStore(context));
client.setUserAgent(USER_AGENT);

2
docs-android/app/src/main/java/com/sismics/docs/service/FileUploadService.java
View File

@@ -15,12 +15,12 @@ import com.sismics.docs.event.FileAddEvent;
import com.sismics.docs.listener.JsonHttpResponseHandler;
import com.sismics.docs.resource.FileResource;
import org.apache.http.Header;
import org.json.JSONObject;
import java.io.IOException;
import java.io.InputStream;
import cz.msebera.android.httpclient.Header;
import de.greenrobot.event.EventBus;
/**

3
docs-android/app/src/main/java/com/sismics/docs/util/PreferenceUtil.java
View File

@@ -7,11 +7,12 @@ import android.preference.PreferenceManager;
import com.loopj.android.http.PersistentCookieStore;
import org.apache.http.cookie.Cookie;
import org.json.JSONObject;
import java.util.List;
import cz.msebera.android.httpclient.cookie.Cookie;
/**
* Utility class on preferences.
*