wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only use OKHttp for http connections and track which schemes are used

Browse source
This commit is contained in:
ligi 2014-03-28 16:58:24 +05:30
parent 74eca8f567
commit 2577b5313a
2 changed files with 69 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/org/ligi/passandroid/ui/ImportAsyncTask.java
View file

@ -4,16 +4,9 @@ import android.app.Activity;
import android.net.Uri;
import android.os.AsyncTask;
import com.squareup.okhttp.OkHttpClient;
import org.ligi.passandroid.Tracker;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
class ImportAsyncTask extends AsyncTask<Void, Void, InputStream> {
@ -27,29 +20,26 @@ class ImportAsyncTask extends AsyncTask<Void, Void, InputStream> {
@Override
protected InputStream doInBackground(Void... params) {
Tracker.get().trackEvent("protocol", "to_inputstream", intent_uri.getScheme(), null);
if (intent_uri.toString().startsWith("content://")) {
try {
return ticketImportActivity.getContentResolver().openInputStream(intent_uri);
} catch (FileNotFoundException e) {
Tracker.get().trackException("ticketImportActivity in ImportAsyncTask", e, false);
}
} else
try {
final OkHttpClient client = new OkHttpClient();
final URL url = new URL(intent_uri.toString());
final HttpURLConnection connection = client.open(url);
switch (intent_uri.getScheme()) {
case "content":
return InputStreamProvider.fromContent(ticketImportActivity, intent_uri);
case "http":
case "https":
// TODO check if SPDY should be here
return InputStreamProvider.fromOKHttp(intent_uri);
default:
Tracker.get().trackException("unknown scheme in ImportAsyncTask" + intent_uri.getScheme(), false);
case "file":
return InputStreamProvider.getDefaultHttpInputStreamForUri(intent_uri);
}
return connection.getInputStream();
} catch (MalformedURLException e) {
Tracker.get().trackException("MalformedURLException in ImportAsyncTask", e, false);
} catch (IOException e) {
Tracker.get().trackException("IOException in ImportAsyncTask", e, false);
}
// TODO bring back Tracker.get().trackTiming("load_time", System.currentTimeMillis() - start_time, "import", "" + intent_uri);
return null;
}
}

53
src/main/java/org/ligi/passandroid/ui/InputStreamProvider.java Normal file
View file

@ -0,0 +1,53 @@
package org.ligi.passandroid.ui;
import android.content.Context;
import android.net.Uri;
import com.squareup.okhttp.OkHttpClient;
import org.ligi.passandroid.Tracker;
import java.io.BufferedInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
public class InputStreamProvider {
public final static InputStream fromOKHttp(Uri intent_uri) {
try {
final OkHttpClient client = new OkHttpClient();
final URL url = new URL(intent_uri.toString());
final HttpURLConnection connection = client.open(url);
return connection.getInputStream();
} catch (MalformedURLException e) {
Tracker.get().trackException("MalformedURLException in ImportAsyncTask", e, false);
} catch (IOException e) {
Tracker.get().trackException("IOException in ImportAsyncTask", e, false);
}
return null;
}
public final static InputStream fromContent(Context ctx, Uri uri) {
try {
return ctx.getContentResolver().openInputStream(uri);
} catch (FileNotFoundException e) {
Tracker.get().trackException("FileNotFoundException in ticketImportActivity/ImportAsyncTask", e, false);
return null;
}
}
public final static InputStream getDefaultHttpInputStreamForUri(Uri intent_uri) {
try {
return new BufferedInputStream(new URL(intent_uri.toString()).openStream(), 4096);
} catch (IOException e) {
Tracker.get().trackException("IOException in ticketImportActivity/ImportAsyncTask", e, false);
return null;
}
}
}