mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-25 02:32:26 -05:00
implemented GoogleDriveFileStorage.java
modified JavaFileStorage interface to work with Google Drive
This commit is contained in:
Philipp Crocoll
parent
1923f28311
commit
30de7e80b6
@ -262,11 +262,17 @@ public class DropboxFileStorage implements JavaFileStorage {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createFolder(String path) throws Exception {
|
||||
public String createFolder(String parentPath, String newDirName) throws Exception {
|
||||
try
|
||||
{
|
||||
path = removeProtocol(path);
|
||||
mApi.createFolder(path);
|
||||
String path = parentPath;
|
||||
if (!path.endsWith("/"))
|
||||
path = path + "/";
|
||||
path = path + newDirName;
|
||||
|
||||
String pathWithoutProtocol = removeProtocol(path);
|
||||
mApi.createFolder(pathWithoutProtocol);
|
||||
return path;
|
||||
}
|
||||
catch (DropboxException e) {
|
||||
throw convertException(e);
|
||||
@ -274,14 +280,25 @@ public class DropboxFileStorage implements JavaFileStorage {
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FileEntry> listFiles(String dirName) throws Exception {
|
||||
public String createFilePath(String parentPath, String newFileName) throws Exception {
|
||||
String path = parentPath;
|
||||
if (!path.endsWith("/"))
|
||||
path = path + "/";
|
||||
path = path + newFileName;
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<FileEntry> listFiles(String parentPath) throws Exception {
|
||||
try
|
||||
{
|
||||
dirName = removeProtocol(dirName);
|
||||
com.dropbox.client2.DropboxAPI.Entry dirEntry = mApi.metadata(dirName, 0, null, true, null);
|
||||
parentPath = removeProtocol(parentPath);
|
||||
com.dropbox.client2.DropboxAPI.Entry dirEntry = mApi.metadata(parentPath, 0, null, true, null);
|
||||
|
||||
if (dirEntry.isDeleted)
|
||||
throw new FileNotFoundException("Directory "+dirName+" is deleted!");
|
||||
throw new FileNotFoundException("Directory "+parentPath+" is deleted!");
|
||||
|
||||
List<FileEntry> result = new ArrayList<FileEntry>();
|
||||
|
||||
@ -310,6 +327,7 @@ public class DropboxFileStorage implements JavaFileStorage {
|
||||
fileEntry.isDirectory = e.isDir;
|
||||
fileEntry.sizeInBytes = e.bytes;
|
||||
fileEntry.path = getProtocolId()+"://"+ e.path;
|
||||
fileEntry.displayName = e.path.substring(e.path.lastIndexOf("/")+1);
|
||||
//Log.d("JFS","fileEntry="+fileEntry);
|
||||
Date lastModifiedDate = null;
|
||||
if (e.modified != null)
|
||||
|
||||
@ -1,124 +1,457 @@
|
||||
package keepass2android.javafilestorage;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
import com.dropbox.client2.exception.DropboxUnlinkedException;
|
||||
import com.google.api.client.extensions.android.http.AndroidHttp;
|
||||
import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
|
||||
import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException;
|
||||
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
|
||||
import com.google.api.client.http.ByteArrayContent;
|
||||
import com.google.api.client.http.GenericUrl;
|
||||
import com.google.api.client.http.HttpResponse;
|
||||
import com.google.api.client.json.gson.GsonFactory;
|
||||
import com.google.api.services.drive.Drive;
|
||||
import com.google.api.services.drive.DriveScopes;
|
||||
import com.google.api.services.drive.Drive.Files;
|
||||
import com.google.api.services.drive.model.About;
|
||||
import com.google.api.services.drive.model.File;
|
||||
import com.google.api.services.drive.model.FileList;
|
||||
import com.google.api.services.drive.model.ParentReference;
|
||||
|
||||
import android.accounts.AccountManager;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.util.Log;
|
||||
|
||||
/*public class GoogleDriveFileStorage
|
||||
{};*/
|
||||
|
||||
public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
|
||||
private static Drive service;
|
||||
//private GoogleAccountCredential credential;
|
||||
|
||||
private static final String GDRIVE_PROTOCOL_ID = "gdrive";
|
||||
private static final String FOLDER_MIME_TYPE = "application/vnd.google-apps.folder";
|
||||
private static final String ISO_8859_1 = "ISO-8859-1";
|
||||
static final int MAGIC_GDRIVE=2082334;
|
||||
static final int REQUEST_ACCOUNT_PICKER = MAGIC_GDRIVE+1;
|
||||
static final int REQUEST_AUTHORIZATION = MAGIC_GDRIVE+2;
|
||||
|
||||
final static private String TAG = "KP2AJ";
|
||||
private static final String NAME_ID_SEP = "-KP2A-";
|
||||
|
||||
/*
|
||||
private static void printFilesInFolder(Drive service, String folderId)
|
||||
throws IOException {
|
||||
Children.List request = service.files().list();
|
||||
class InvalidPathException extends Exception
|
||||
{
|
||||
public InvalidPathException() {}
|
||||
|
||||
do {
|
||||
try {
|
||||
ChildList children = request.execute();
|
||||
|
||||
for (ChildReference child : children.getItems()) {
|
||||
System.out.println("File Id: " + child.getId());
|
||||
public InvalidPathException(String message)
|
||||
{
|
||||
super(message);
|
||||
}
|
||||
request.setPageToken(children.getNextPageToken());
|
||||
} catch (IOException e) {
|
||||
System.out.println("An error occurred: " + e);
|
||||
request.setPageToken(null);
|
||||
}
|
||||
} while (request.getPageToken() != null &&
|
||||
request.getPageToken().length() > 0);
|
||||
}
|
||||
|
||||
|
||||
class FileSystemEntryData
|
||||
{
|
||||
String displayName;
|
||||
String id;
|
||||
HashSet<String> parentIds = new HashSet<String>();
|
||||
};
|
||||
|
||||
class AccountData
|
||||
{
|
||||
Drive drive;
|
||||
|
||||
HashMap<String /*fileId*/, FileSystemEntryData> mFileSystemEntryCache;
|
||||
|
||||
protected String mRootFolderId;
|
||||
};
|
||||
|
||||
HashMap<String /*accountName*/, AccountData> mAccountData = new HashMap<String, AccountData>();
|
||||
|
||||
|
||||
private static String encode(final String unencoded)
|
||||
throws UnsupportedEncodingException {
|
||||
return java.net.URLEncoder.encode(unencoded, ISO_8859_1);
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
private String decode(String encodedString)
|
||||
throws UnsupportedEncodingException {
|
||||
return java.net.URLDecoder.decode(encodedString, ISO_8859_1);
|
||||
}
|
||||
|
||||
public static String getRootPathForAccount(String accountName) throws UnsupportedEncodingException {
|
||||
return GDRIVE_PROTOCOL_ID+"://"+encode(accountName)+"/";
|
||||
}
|
||||
|
||||
class GDrivePath
|
||||
{
|
||||
String mAccount;
|
||||
String mAccountLocalPath; // the path after the "gdrive://account%40%0Agmail.com/"
|
||||
|
||||
public GDrivePath(String path) throws InvalidPathException, IOException
|
||||
{
|
||||
setPath(path);
|
||||
}
|
||||
|
||||
private void setPath(String path) throws
|
||||
InvalidPathException, IOException {
|
||||
mAccount = extractAccount(path);
|
||||
mAccountLocalPath = path.substring(getProtocolId().length()+3+encode(mAccount).length()+1);
|
||||
verifyWithRetry();
|
||||
}
|
||||
|
||||
public GDrivePath(String parentPath, File fileToAppend) throws UnsupportedEncodingException, FileNotFoundException, IOException, InvalidPathException
|
||||
{
|
||||
setPath(parentPath);
|
||||
|
||||
if ((!mAccountLocalPath.endsWith("/")) && (!mAccountLocalPath.equals("")))
|
||||
mAccountLocalPath = mAccountLocalPath + "/";
|
||||
mAccountLocalPath += encode(fileToAppend.getTitle())+NAME_ID_SEP+fileToAppend.getId();
|
||||
}
|
||||
|
||||
private void verifyWithRetry() throws IOException,
|
||||
FileNotFoundException {
|
||||
try
|
||||
{
|
||||
verify();
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
{
|
||||
//the folders cache might be out of date -> rebuild and try again:
|
||||
AccountData accountData = mAccountData.get(mAccount);
|
||||
accountData.mFileSystemEntryCache = buildFoldersCache(mAccount);
|
||||
|
||||
verify();
|
||||
}
|
||||
}
|
||||
|
||||
//make sure the path exists
|
||||
private void verify() throws FileNotFoundException {
|
||||
|
||||
if (mAccountLocalPath.equals(""))
|
||||
return;
|
||||
|
||||
String[] parts = mAccountLocalPath.split("/");
|
||||
|
||||
AccountData accountData = mAccountData.get(mAccount);
|
||||
|
||||
String parentId = accountData.mRootFolderId;
|
||||
for (String part: parts)
|
||||
{
|
||||
String id = part.substring(part.lastIndexOf(NAME_ID_SEP)+NAME_ID_SEP.length());
|
||||
FileSystemEntryData thisFolder = accountData.mFileSystemEntryCache.get(id);
|
||||
if (thisFolder == null)
|
||||
throw new FileNotFoundException("couldn't find id " + id + " being part of "+ mAccountLocalPath+" in GDrive account " + mAccount);
|
||||
if (thisFolder.parentIds.contains(parentId) == false)
|
||||
throw new FileNotFoundException("couldn't find parent id " + parentId + " as parent of "+thisFolder.displayName +" in "+ mAccountLocalPath+" in GDrive account " + mAccount);
|
||||
|
||||
parentId = id;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private String extractAccount(String path) throws InvalidPathException, UnsupportedEncodingException {
|
||||
if (!path.startsWith(getProtocolId()+"://"))
|
||||
throw new InvalidPathException("Invalid path: "+path);
|
||||
String pathWithoutProtocol = path.substring(getProtocolId().length()+3);
|
||||
String accountNameEncoded = pathWithoutProtocol.substring(0, pathWithoutProtocol.indexOf("/"));
|
||||
return decode(accountNameEncoded);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getGDriveId() throws InvalidPathException, UnsupportedEncodingException {
|
||||
String pathWithoutTrailingSlash = mAccountLocalPath;
|
||||
if (pathWithoutTrailingSlash.endsWith("/"))
|
||||
pathWithoutTrailingSlash = pathWithoutTrailingSlash.substring(0,pathWithoutTrailingSlash.length()-1);
|
||||
if (pathWithoutTrailingSlash.equals(""))
|
||||
{
|
||||
return mAccountData.get(mAccount).mRootFolderId;
|
||||
}
|
||||
String lastPart = pathWithoutTrailingSlash.substring(pathWithoutTrailingSlash.lastIndexOf(NAME_ID_SEP)+NAME_ID_SEP.length());
|
||||
if (lastPart.contains("/"))
|
||||
throw new InvalidPathException("error extracting GDriveId from "+mAccountLocalPath);
|
||||
return decode(lastPart);
|
||||
}
|
||||
|
||||
public String getFullPath() throws UnsupportedEncodingException {
|
||||
return getProtocolId()+"://"+encode(mAccount)+"/"+mAccountLocalPath;
|
||||
}
|
||||
|
||||
public String getAccount() {
|
||||
return mAccount;
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
@Override
|
||||
public boolean checkForFileChangeFast(String path,
|
||||
String previousFileVersion) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
String currentVersion = getCurrentFileVersionFast(path);
|
||||
if (currentVersion == null)
|
||||
return false;
|
||||
return currentVersion.equals(previousFileVersion) == false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCurrentFileVersionFast(String path) {
|
||||
// TODO Auto-generated method stub
|
||||
return "";
|
||||
|
||||
try {
|
||||
GDrivePath gdrivePath = new GDrivePath(path);
|
||||
return getFileForPath(gdrivePath, getDriveService(gdrivePath.getAccount())).getMd5Checksum();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream openFileForRead(String path) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
|
||||
GDrivePath gdrivePath = new GDrivePath(path);
|
||||
Drive driveService = getDriveService(gdrivePath.getAccount());
|
||||
|
||||
try
|
||||
{
|
||||
File file = getFileForPath(gdrivePath, driveService);
|
||||
return getFileContent(file, driveService);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private File getFileForPath(GDrivePath path, Drive driveService)
|
||||
throws IOException, InvalidPathException {
|
||||
|
||||
File file = driveService.files().get(path.getGDriveId()).execute();
|
||||
return file;
|
||||
}
|
||||
|
||||
private InputStream getFileContent(File driveFile, Drive driveService) throws IOException {
|
||||
if (driveFile.getDownloadUrl() != null && driveFile.getDownloadUrl().length() > 0) {
|
||||
|
||||
GenericUrl downloadUrl = new GenericUrl(driveFile.getDownloadUrl());
|
||||
|
||||
HttpResponse resp = driveService.getRequestFactory().buildGetRequest(downloadUrl).execute();
|
||||
return resp.getContent();
|
||||
} else {
|
||||
//return an empty input stream
|
||||
return new ByteArrayInputStream("".getBytes());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void uploadFile(String path, byte[] data, boolean writeTransactional)
|
||||
throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
ByteArrayContent content = new ByteArrayContent(null, data);
|
||||
GDrivePath gdrivePath = new GDrivePath(path);
|
||||
Drive driveService = getDriveService(gdrivePath.getAccount());
|
||||
try
|
||||
{
|
||||
File driveFile = getFileForPath(gdrivePath, driveService);
|
||||
getDriveService(gdrivePath.getAccount()).files()
|
||||
.update(driveFile.getId(), driveFile, content).execute();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createFolder(String path) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
public String createFolder(String parentPath, String newDirName) throws Exception {
|
||||
File body = new File();
|
||||
body.setTitle(newDirName);
|
||||
body.setMimeType(FOLDER_MIME_TYPE);
|
||||
|
||||
GDrivePath parentGdrivePath = new GDrivePath(parentPath);
|
||||
|
||||
body.setParents(
|
||||
Arrays.asList(new ParentReference().setId(parentGdrivePath.getGDriveId())));
|
||||
try
|
||||
{
|
||||
File file = getDriveService(parentGdrivePath.getAccount()).files().insert(body).execute();
|
||||
|
||||
Log.d(TAG, "created folder "+newDirName+" in "+parentPath+". id: "+file.getId());
|
||||
|
||||
return new GDrivePath(parentPath, file).getFullPath();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FileEntry> listFiles(String dirName) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
public String createFilePath(String parentPath, String newFileName) throws Exception {
|
||||
File body = new File();
|
||||
body.setTitle(newFileName);
|
||||
GDrivePath parentGdrivePath = new GDrivePath(parentPath);
|
||||
|
||||
body.setParents(
|
||||
Arrays.asList(new ParentReference().setId(parentGdrivePath.getGDriveId())));
|
||||
try
|
||||
{
|
||||
File file = getDriveService(parentGdrivePath.getAccount()).files().insert(body).execute();
|
||||
|
||||
return new GDrivePath(parentPath, file).getFullPath();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<FileEntry> listFiles(String parentPath) throws Exception {
|
||||
GDrivePath gdrivePath = new GDrivePath(parentPath);
|
||||
String parentId = gdrivePath.getGDriveId();
|
||||
|
||||
List<FileEntry> result = new ArrayList<FileEntry>();
|
||||
|
||||
Drive driveService = getDriveService(gdrivePath.getAccount());
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
if (driveService.files().get(parentId).execute().getLabels().getTrashed())
|
||||
throw new FileNotFoundException(parentPath + " is trashed!");
|
||||
|
||||
Files.List request = driveService.files().list()
|
||||
.setQ("trashed=false and hidden=false and '"+parentId+"' in parents");
|
||||
|
||||
do {
|
||||
try {
|
||||
FileList files = request.execute();
|
||||
|
||||
for (File file : files.getItems()) {
|
||||
|
||||
String path = new GDrivePath(parentPath, file).getFullPath();
|
||||
FileEntry e = convertToFileEntry(file, path);
|
||||
|
||||
result.add(e);
|
||||
}
|
||||
request.setPageToken(files.getNextPageToken());
|
||||
} catch (IOException e) {
|
||||
System.out.println("An error occurred: " + e);
|
||||
request.setPageToken(null);
|
||||
throw e;
|
||||
}
|
||||
} while (request.getPageToken() != null && request.getPageToken().length() > 0);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
private Exception convertException(Exception e) {
|
||||
if (GoogleJsonResponseException.class.isAssignableFrom(e.getClass()) )
|
||||
{
|
||||
GoogleJsonResponseException jsonEx = (GoogleJsonResponseException)e;
|
||||
if (jsonEx.getDetails().getCode() == 404)
|
||||
return new FileNotFoundException(jsonEx.getMessage());
|
||||
}
|
||||
|
||||
return e;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private FileEntry convertToFileEntry(File file, String path) {
|
||||
FileEntry e = new FileEntry();
|
||||
e.canRead = e.canWrite = true;
|
||||
e.isDirectory = FOLDER_MIME_TYPE.equals(file.getMimeType());
|
||||
e.lastModifiedTime = file.getModifiedDate().getValue();
|
||||
e.path = path;
|
||||
try
|
||||
{
|
||||
e.sizeInBytes = file.getFileSize();
|
||||
}
|
||||
catch (NullPointerException ex)
|
||||
{
|
||||
e.sizeInBytes = 0;
|
||||
}
|
||||
e.displayName = file.getTitle();
|
||||
return e;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public FileEntry getFileEntry(String filename) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
|
||||
try
|
||||
{
|
||||
GDrivePath gdrivePath = new GDrivePath(filename);
|
||||
return convertToFileEntry(
|
||||
getFileForPath(gdrivePath, getDriveService(gdrivePath.getAccount())),
|
||||
filename);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(String path) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
GDrivePath gdrivePath = new GDrivePath(path);
|
||||
Drive driveService = getDriveService(gdrivePath.getAccount());
|
||||
try
|
||||
{
|
||||
driveService.files().delete(gdrivePath.getGDriveId()).execute();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw convertException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private Drive getDriveService(GoogleAccountCredential credential) {
|
||||
private Drive createDriveService(String accountName, Activity activity) {
|
||||
GoogleAccountCredential credential = createCredential(activity);
|
||||
credential.setSelectedAccountName(accountName);
|
||||
|
||||
return new Drive.Builder(AndroidHttp.newCompatibleTransport(), new GsonFactory(), credential)
|
||||
.setApplicationName("JFSTest")
|
||||
.setApplicationName("Keepass2Android")
|
||||
.build();
|
||||
}
|
||||
|
||||
private Drive getDriveService(String accountName)
|
||||
{
|
||||
AccountData accountData = mAccountData.get(accountName);
|
||||
return accountData.drive;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityResult(final JavaFileStorage.FileStorageSetupActivity setupAct, int requestCode, int resultCode, Intent data) {
|
||||
Log.d(TAG, "ActivityResult: "+requestCode+"/"+resultCode);
|
||||
@ -128,20 +461,24 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
if (resultCode == Activity.RESULT_OK && data != null && data.getExtras() != null) {
|
||||
String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);
|
||||
if (accountName != null) {
|
||||
final Activity activity = (Activity)setupAct;
|
||||
final boolean[] result = { false };
|
||||
Log.d(TAG, "Account name="+accountName);
|
||||
try {
|
||||
testAuthAndReturn(setupAct, accountName, activity, result);
|
||||
//try
|
||||
{
|
||||
//listFolders("root", 0);
|
||||
initializeAccount(setupAct, accountName);
|
||||
//testAuthAndReturn(setupAct, accountName, activity, result);
|
||||
|
||||
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
} /*catch (UnsupportedEncodingException e) {
|
||||
Log.e(TAG, "UnsupportedEncodingException: "+e.toString());
|
||||
Intent retData = new Intent();
|
||||
retData.putExtra(EXTRA_ERROR_MESSAGE, e.getMessage());
|
||||
((Activity)activity).setResult(Activity.RESULT_CANCELED, retData);
|
||||
((Activity)activity).finish();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}*/
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -153,7 +490,19 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
|
||||
case REQUEST_AUTHORIZATION:
|
||||
if (resultCode == Activity.RESULT_OK) {
|
||||
finishActivityWithSuccess(setupAct);
|
||||
for (String k: data.getExtras().keySet())
|
||||
{
|
||||
Log.d(TAG, data.getExtras().get(k).toString());
|
||||
}
|
||||
String accountName = data.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);
|
||||
if (accountName != null) {
|
||||
Log.d(TAG, "Account name="+accountName);
|
||||
initializeAccount(setupAct, accountName);
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.d(TAG, "Account name is null");
|
||||
}
|
||||
} else {
|
||||
Log.i(TAG, "Error authenticating");
|
||||
//Intent retData = new Intent();
|
||||
@ -166,7 +515,9 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
|
||||
}
|
||||
|
||||
private void testAuthAndReturn(
|
||||
|
||||
|
||||
/* private void testAuthAndReturn(
|
||||
final JavaFileStorage.FileStorageSetupActivity setupAct,
|
||||
String accountName, final Activity activity, final boolean[] result)
|
||||
throws UnsupportedEncodingException {
|
||||
@ -181,10 +532,8 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
//todo: is there a simpler way to test if the user is authorized?
|
||||
try
|
||||
{
|
||||
Log.d(TAG,"createCred");
|
||||
GoogleAccountCredential credential = createCredential(activity);
|
||||
Log.d(TAG,"get files");
|
||||
Files.List request = getDriveService(credential).files().list();
|
||||
Files.List request = getDriveService(accountName, activity).files().list();
|
||||
Log.d(TAG,"get files exec");
|
||||
request.execute();
|
||||
Log.d(TAG,"ok!");
|
||||
@ -219,6 +568,101 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
activity.setResult(Activity.RESULT_CANCELED, retData);
|
||||
activity.finish();
|
||||
}
|
||||
}
|
||||
*/
|
||||
private void initializeAccount(final JavaFileStorage.FileStorageSetupActivity setupAct, final String accountName) {
|
||||
|
||||
final Activity activity = ((Activity)setupAct);
|
||||
|
||||
AsyncTask<Object, Void, AsyncTaskResult<String> > task = new AsyncTask<Object, Void, AsyncTaskResult<String>>()
|
||||
{
|
||||
|
||||
@Override
|
||||
protected AsyncTaskResult<String> doInBackground(Object... arg0) {
|
||||
try {
|
||||
AccountData newAccountData = new AccountData();
|
||||
newAccountData.drive = createDriveService(accountName, activity);
|
||||
mAccountData.put(accountName, newAccountData);
|
||||
Log.d(TAG, "Added account data for " + accountName);
|
||||
newAccountData.mFileSystemEntryCache = buildFoldersCache(accountName);
|
||||
|
||||
About about = newAccountData.drive.about().get().execute();
|
||||
newAccountData.mRootFolderId = about.getRootFolderId();
|
||||
|
||||
|
||||
setupAct.getState().putString(EXTRA_PATH, getRootPathForAccount(accountName));
|
||||
return new AsyncTaskResult<String>("ok");
|
||||
} catch ( Exception anyError) {
|
||||
return new AsyncTaskResult<String>(anyError);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(AsyncTaskResult<String> result) {
|
||||
Exception error = result.getError();
|
||||
if (error != null ) {
|
||||
if (UserRecoverableAuthIOException.class.isAssignableFrom(error.getClass()))
|
||||
{
|
||||
activity.startActivityForResult(((UserRecoverableAuthIOException)error).getIntent(), REQUEST_AUTHORIZATION);
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.e(TAG, "Exception: "+error.toString());
|
||||
error.printStackTrace();
|
||||
Intent retData = new Intent();
|
||||
retData.putExtra(EXTRA_ERROR_MESSAGE, error.getMessage());
|
||||
activity.setResult(Activity.RESULT_CANCELED, retData);
|
||||
activity.finish();
|
||||
}
|
||||
} else if ( isCancelled()) {
|
||||
// cancel handling here
|
||||
Log.d(TAG,"Async Task cancelled!");
|
||||
|
||||
activity.setResult(Activity.RESULT_CANCELED);
|
||||
activity.finish();
|
||||
} else {
|
||||
|
||||
//all right!
|
||||
finishActivityWithSuccess(setupAct);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
task.execute(new Object[]{});
|
||||
|
||||
}
|
||||
|
||||
private HashMap<String,FileSystemEntryData> buildFoldersCache(String accountName) throws IOException {
|
||||
|
||||
HashMap<String, FileSystemEntryData> fileSystemEntryCache = new HashMap<String, GoogleDriveFileStorage.FileSystemEntryData>();
|
||||
|
||||
FileList folders=getDriveService(accountName).files().list().setQ("trashed=false and hidden=false").execute();
|
||||
for(File fl: folders.getItems()){
|
||||
|
||||
FileSystemEntryData thisFileSystemEntry = new FileSystemEntryData();
|
||||
thisFileSystemEntry.id = fl.getId();
|
||||
thisFileSystemEntry.displayName = fl.getTitle();
|
||||
|
||||
Log.v("JFS"+" fOLDER name:",fl.getTitle());
|
||||
Log.v("JFS"+" fOLDER id:",fl.getId());
|
||||
for (ParentReference parent: fl.getParents())
|
||||
{
|
||||
Log.v("JFS"+" parent id:",parent.getId());
|
||||
thisFileSystemEntry.parentIds.add(parent.getId());
|
||||
}
|
||||
fileSystemEntryCache.put(thisFileSystemEntry.id, thisFileSystemEntry);
|
||||
}
|
||||
|
||||
return fileSystemEntryCache;
|
||||
|
||||
}
|
||||
|
||||
private void finishActivityWithSuccess(FileStorageSetupActivity setupActivity) {
|
||||
@ -237,7 +681,9 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
if (setupActivity.getProcessName().equals(PROCESS_NAME_SELECTFILE))
|
||||
{
|
||||
Intent data = new Intent();
|
||||
data.putExtra(EXTRA_PATH, setupActivity.getState().getString(EXTRA_PATH));
|
||||
Log.d(TAG,setupActivity.getState().getString(EXTRA_PATH));
|
||||
String path = setupActivity.getState().getString(EXTRA_PATH);
|
||||
data.putExtra(EXTRA_PATH, path);
|
||||
activity.setResult(RESULT_FILECHOOSER_PREPARED, data);
|
||||
activity.finish();
|
||||
return;
|
||||
@ -248,8 +694,6 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void startSelectFile(JavaFileStorage.FileStorageSetupInitiatorActivity activity, boolean isForSave,
|
||||
int requestCode) {
|
||||
@ -264,8 +708,7 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
|
||||
@Override
|
||||
public String getProtocolId() {
|
||||
|
||||
return "gdrive";
|
||||
return GDRIVE_PROTOCOL_ID;
|
||||
}
|
||||
|
||||
|
||||
@ -290,6 +733,7 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
|
||||
if (PROCESS_NAME_FILE_USAGE_SETUP.equals(setupAct.getProcessName()))
|
||||
{
|
||||
/*TODO
|
||||
GoogleAccountCredential credential = createCredential(activity);
|
||||
|
||||
String storedAccountName = PreferenceManager.getDefaultSharedPreferences(activity).getString("GDRIVE_ACCOUNT_NAME", null);
|
||||
@ -297,6 +741,7 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
if (storedAccountName != null)
|
||||
{
|
||||
credential.setSelectedAccountName(storedAccountName);
|
||||
|
||||
Thread thread = new Thread() {
|
||||
|
||||
@Override
|
||||
@ -333,13 +778,14 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
activity.finish();
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
private GoogleAccountCredential createCredential(Activity activity) {
|
||||
List<String> scopes = new ArrayList<String>();
|
||||
scopes.add(DriveScopes.DRIVE);
|
||||
GoogleAccountCredential credential = GoogleAccountCredential.usingOAuth2(activity, scopes);
|
||||
GoogleAccountCredential credential = GoogleAccountCredential.usingOAuth2(activity.getApplicationContext(), scopes);
|
||||
return credential;
|
||||
}
|
||||
|
||||
@ -352,8 +798,8 @@ public class GoogleDriveFileStorage implements JavaFileStorage {
|
||||
@Override
|
||||
public void onCreate(FileStorageSetupActivity activity,
|
||||
Bundle savedInstanceState) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -43,6 +43,7 @@ public class FileEntry {
|
||||
public boolean canRead;
|
||||
public boolean canWrite;
|
||||
public long sizeInBytes;
|
||||
public String displayName;
|
||||
|
||||
public FileEntry()
|
||||
{
|
||||
@ -123,9 +124,14 @@ public class FileEntry {
|
||||
|
||||
public void uploadFile(String path, byte[] data, boolean writeTransactional) throws Exception;
|
||||
|
||||
public void createFolder(String path) throws Exception;
|
||||
//creates a folder "newDirName" in parentPath and returns the path of the new folder
|
||||
public String createFolder(String parentPath, String newDirName) throws Exception;
|
||||
|
||||
public List<FileEntry> listFiles(String dirName) throws Exception;
|
||||
//returns the path of a file "newFileName" in the folder "parentPath"
|
||||
//this may create the file if this is required to get a path (if a UUID is part of the file path)
|
||||
public String createFilePath(String parentPath, String newFileName) throws Exception;
|
||||
|
||||
public List<FileEntry> listFiles(String parentPath) throws Exception;
|
||||
|
||||
public FileEntry getFileEntry(String filename) throws Exception;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user