phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'file_chooser'

Browse Source
This commit is contained in:
fkloft
2014-01-20 23:09:05 +01:00
parent d645064a6d 728144d46f
commit 0d9f2293fe
6 changed files with 214 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
View File

@ -18,10 +18,12 @@ import android.widget.BaseAdapter;
import android.widget.TextView;
import android.widget.Toast;
import com.cradle.iitc_mobile.IITC_Mobile.ResponseHandler;
/**
* this class manages automatic login using the Google account stored on the device
*/
public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle>, ResponseHandler {
/**
* Adapter to show available accounts in a ListView. Accounts are read from mAccounts
*/
@ -126,6 +128,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
/**
* called by IITC_Mobile when the authentication activity has finished.
*/
@Override
public void onActivityResult(int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK)
// authentication activity succeeded, request token again
@ -149,7 +152,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback<Bundle> {
// There is a reason we need to start the given activity if we want an
// authentication token. (Could be user confirmation or something else. Whatever,
// we have to start it) IITC_Mobile will call it using startActivityForResult
mActivity.startLoginActivity(launch);
mActivity.startActivityForResult(launch, this);
return;
}

101
mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java
View File

@ -1,11 +1,19 @@
package com.cradle.iitc_mobile;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.AssetManager;
import android.net.Uri;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.util.Base64;
import android.util.Base64OutputStream;
import android.webkit.WebResourceResponse;
import android.widget.Toast;
import com.cradle.iitc_mobile.IITC_Mobile.ResponseHandler;
import org.json.JSONObject;
@ -16,7 +24,10 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.net.URL;
import java.net.URLEncoder;
import java.util.HashMap;
public class IITC_FileManager {
@ -112,6 +123,10 @@ public class IITC_FileManager {
return mAssetManager.open(filename);
}
private WebResourceResponse getFileRequest(Uri uri) {
return new FileRequest(uri);
}
private WebResourceResponse getScript(Uri uri) {
InputStream stream;
try {
@ -179,6 +194,10 @@ public class IITC_FileManager {
return os.toString();
}
public String getFileRequestPrefix() {
return "//file-request" + DOMAIN + "/";
}
public String getIITCVersion() throws IOException {
InputStream stream = getAssetFile("total-conversion-build.user.js");
@ -196,8 +215,90 @@ public class IITC_FileManager {
return getScript(uri);
if ("user-plugin".equals(host))
return getUserPlugin(uri);
if ("file-request".equals(host))
return getFileRequest(uri);
Log.e("could not generate response for url: " + uri);
return EMPTY;
}
private class FileRequest extends WebResourceResponse implements ResponseHandler, Runnable {
private Intent mData;
private String mFunctionName;
private int mResultCode;
private PipedOutputStream mStreamOut;
private FileRequest(Uri uri) {
// create two connected streams we can write to after the file has been read
super("application/x-javascript", "UTF-8", new PipedInputStream());
try {
mStreamOut = new PipedOutputStream((PipedInputStream) getData());
} catch (IOException e) {
Log.w(e);
}
// the function to call
mFunctionName = uri.getPathSegments().get(0);
// create the chooser Intent
final Intent target = new Intent(Intent.ACTION_GET_CONTENT);
target.setType("file/*");
target.addCategory(Intent.CATEGORY_OPENABLE);
Intent intent = Intent.createChooser(target, "Choose file");
try {
mIitc.startActivityForResult(intent, this);
} catch (ActivityNotFoundException e) {
Toast.makeText(mIitc, "No activity to select a file found." +
"Please install a file browser of your choice!", Toast.LENGTH_LONG).show();
}
}
@Override
public void onActivityResult(int resultCode, Intent data) {
mIitc.deleteResponseHandler(this); // to enable garbage collection
mResultCode = resultCode;
mData = data;
new Thread(this, "FileRequestReader").start();
}
@Override
public void run() {
try {
if (mResultCode == Activity.RESULT_OK && mData != null) {
Uri uri = mData.getData();
File file = new File(uri.getPath());
mStreamOut.write(
(mFunctionName + "('" + URLEncoder.encode(file.getName(), "UTF-8") + "', '").getBytes());
Base64OutputStream encoder =
new Base64OutputStream(mStreamOut, Base64.NO_CLOSE | Base64.NO_WRAP | Base64.DEFAULT);
FileInputStream fileinput = new FileInputStream(file);
int c;
while ((c = fileinput.read()) != -1)
{
encoder.write(c);
}
encoder.close();
mStreamOut.write("');".getBytes());
}
mStreamOut.close();
} catch (IOException e) {
Log.w(e);
// try to close stream, but ignore errors
try {
mStreamOut.close();
} catch (IOException e1) {
}
}
}
}
}

5
mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
View File

@ -224,4 +224,9 @@ public class IITC_JSInterface {
}
});
}
@JavascriptInterface
public String getFileRequestUrlPrefix() {
return mIitc.getFileManager().getFileRequestPrefix();
}
}

44
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -42,10 +42,9 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Stack;
import java.util.Vector;
public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeListener {
private static final int REQUEST_LOGIN = 1;
private static final String mIntelUrl = "https://www.ingress.com/intel";
private SharedPreferences mSharedPrefs;
@ -55,6 +54,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
private IITC_NavigationHelper mNavigationHelper;
private IITC_MapSettings mMapSettings;
private IITC_DeviceAccountLogin mLogin;
private Vector<ResponseHandler> mResponseHandlers = new Vector<ResponseHandler>();
private boolean mDesktopMode = false;
private boolean mAdvancedMenu = false;
private MenuItem mSearchMenuItem;
@ -572,23 +572,33 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
return this.mIitcWebView;
}
/**
* It can occur that in order to authenticate, an external activity has to be launched.
* (This could for example be a confirmation dialog.)
*/
public void startLoginActivity(Intent launch) {
startActivityForResult(launch, REQUEST_LOGIN); // REQUEST_LOGIN is to recognize the result
public void startActivityForResult(Intent launch, ResponseHandler handler) {
int index = mResponseHandlers.indexOf(handler);
if (index == -1) {
mResponseHandlers.add(handler);
index = mResponseHandlers.indexOf(handler);
}
startActivityForResult(launch, RESULT_FIRST_USER + index);
}
public void deleteResponseHandler(ResponseHandler handler) {
int index = mResponseHandlers.indexOf(handler);
if (index != -1) {
// set value to null to enable garbage collection, but don't remove it to keep indexes
mResponseHandlers.set(index, null);
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case REQUEST_LOGIN:
// authentication activity has returned. mLogin will continue authentication
mLogin.onActivityResult(resultCode, data);
break;
default:
super.onActivityResult(requestCode, resultCode, data);
int index = requestCode - RESULT_FIRST_USER;
try {
ResponseHandler handler = mResponseHandlers.get(index);
handler.onActivityResult(resultCode, data);
} catch (ArrayIndexOutOfBoundsException e) {
super.onActivityResult(requestCode, resultCode, data);
}
}
@ -764,4 +774,8 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
public IITC_UserLocation getUserLocation() {
return mUserLocation;
}
public interface ResponseHandler {
void onActivityResult(int resultCode, Intent data);
}
}