moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-12-23 15:38:47 -05:00
Code Issues Releases Wiki Activity

Implemented SkyDriveFileStorage including transactional write

Browse Source
This commit is contained in:
Philipp Crocoll 2013-11-04 22:26:21 +01:00
parent 17bfc0c975
commit 684312b412
6 changed files with 540 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/JavaFileStorage/project.properties
View File

@ -13,4 +13,5 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.
# Project target.
target=android-17
android.library=true
android.library.reference.1=../../../../../../../AppData/Local/Android/android-sdk/extras/google/google_play_services/libproject/google-play-services_lib
android.library.reference.1=..\\..\\..\\..\\..\\..\\..\\AppData\\Local\\Android\\android-sdk\\extras\\google\\google_play_services\\libproject\\google-play-services_lib
android.library.reference.2=../../../../LiveSDK-for-Android/src

524
src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveFileStorage.java
View File

@ -1,36 +1,45 @@
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.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import keepass2android.javafilestorage.JavaFileStorageBase.InvalidPathException;
import keepass2android.javafilestorage.skydrive.SkyDriveException;
import keepass2android.javafilestorage.skydrive.SkyDriveFile;
import keepass2android.javafilestorage.skydrive.SkyDriveFolder;
import keepass2android.javafilestorage.skydrive.SkyDriveObject;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.google.api.services.drive.model.File;
import com.microsoft.live.LiveAuthClient;
import com.microsoft.live.LiveAuthException;
import com.microsoft.live.LiveAuthListener;
import com.microsoft.live.LiveConnectClient;
import com.microsoft.live.LiveConnectSession;
import com.microsoft.live.LiveDownloadOperation;
import com.microsoft.live.LiveOperation;
import com.microsoft.live.LiveOperationException;
import com.microsoft.live.LiveStatus;
import com.microsoft.live.OverwriteOption;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
public class SkyDriveFileStorage extends JavaFileStorageBase {
private LiveAuthClient mAuthClient;
@ -43,10 +52,10 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
private HashMap<String /* id */, SkyDriveObject> mFolderCache = new HashMap<String, SkyDriveObject>();
public static final String[] SCOPES = {
"wl.signin",
"wl.skydrive_update",
};
public static final String[] SCOPES = { "wl.signin", "wl.skydrive_update", };
// see http://stackoverflow.com/questions/17997688/howto-to-parse-skydrive-api-date-in-java
SimpleDateFormat SKYDRIVE_DATEFORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.ENGLISH);
public final class JsonKeys {
public static final String CODE = "code";
@ -81,60 +90,58 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
}
}
class SkyDrivePath
{
class SkyDrivePath {
String mPath;
public SkyDrivePath()
{
public SkyDrivePath() {
}
public SkyDrivePath(String path) throws UnsupportedEncodingException, FileNotFoundException, InvalidPathException, LiveOperationException, SkyDriveException
{
public SkyDrivePath(String path) throws UnsupportedEncodingException,
FileNotFoundException, InvalidPathException,
LiveOperationException, SkyDriveException {
setPath(path);
}
public SkyDrivePath(String parentPath, JSONObject fileToAppend) throws UnsupportedEncodingException, FileNotFoundException, IOException, InvalidPathException, JSONException, LiveOperationException, SkyDriveException
{
public SkyDrivePath(String parentPath, JSONObject fileToAppend)
throws UnsupportedEncodingException, FileNotFoundException,
IOException, InvalidPathException, JSONException,
LiveOperationException, SkyDriveException {
setPath(parentPath);
if ((!mPath.endsWith("/")) && (!mPath.equals("")))
mPath = mPath + "/";
mPath += encode(fileToAppend.getString("name"))+NAME_ID_SEP+encode(fileToAppend.getString("id"));
mPath += encode(fileToAppend.getString("name")) + NAME_ID_SEP
+ encode(fileToAppend.getString("id"));
}
public void setPath(String path) throws UnsupportedEncodingException, InvalidPathException, FileNotFoundException, LiveOperationException, SkyDriveException {
public void setPath(String path) throws UnsupportedEncodingException,
InvalidPathException, FileNotFoundException,
LiveOperationException, SkyDriveException {
setPathWithoutVerify(path);
verifyWithRetry();
}
private void verifyWithRetry() throws FileNotFoundException, LiveOperationException, SkyDriveException, UnsupportedEncodingException {
try
{
private void verifyWithRetry() throws FileNotFoundException,
LiveOperationException, SkyDriveException,
UnsupportedEncodingException {
try {
verify();
}
catch (FileNotFoundException e)
{
} catch (FileNotFoundException e) {
initializeFoldersCache();
verify();
}
}
public void setPathWithoutVerify(String path) throws UnsupportedEncodingException, InvalidPathException
{
public void setPathWithoutVerify(String path)
throws UnsupportedEncodingException, InvalidPathException {
mPath = path.substring(getProtocolPrefix().length());
// Log.d(TAG, " mAccount=" + mAccount);
// Log.d(TAG, " mAccountLocalPath=" + mAccountLocalPath);
}
// make sure the path exists
private void verify() throws FileNotFoundException, UnsupportedEncodingException {
private void verify() throws FileNotFoundException,
UnsupportedEncodingException {
if (mPath.equals(""))
return;
@ -143,38 +150,43 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
String parentId = mRootFolderId;
for (int i=0;i<parts.length;i++)
{
for (int i = 0; i < parts.length; i++) {
String part = parts[i];
// Log.d(TAG, "parsing part " + part);
int indexOfSeparator = part.lastIndexOf(NAME_ID_SEP);
if (indexOfSeparator < 0)
throw new FileNotFoundException("invalid path " + mPath);
String id = decode(part.substring(indexOfSeparator+NAME_ID_SEP.length()));
String id = decode(part.substring(indexOfSeparator
+ NAME_ID_SEP.length()));
String name = decode(part.substring(0, indexOfSeparator));
// Log.d(TAG, " name=" + name);
SkyDriveObject thisFolder = mFolderCache.get(id);
if (thisFolder == null)
{
if (thisFolder == null) {
thisFolder = tryAddFileToCache(this);
// check if it's still null
if (thisFolder == null)
throw new FileNotFoundException("couldn't find id " + id + " being part of "+ mPath+" in SkyDrive ");
throw new FileNotFoundException("couldn't find id "
+ id + " being part of " + mPath
+ " in SkyDrive ");
}
if (thisFolder.getParentId().equals(parentId) == false)
throw new FileNotFoundException("couldn't find parent id " + parentId + " as parent of "+thisFolder.getName() +" in "+ mPath+" in SkyDrive");
throw new FileNotFoundException("couldn't find parent id "
+ parentId + " as parent of "
+ thisFolder.getName() + " in " + mPath
+ " in SkyDrive");
if (thisFolder.getName().equals(name) == false)
throw new FileNotFoundException("Name of "+id+" changed from "+name+" to "+thisFolder.getName() +" in "+ mPath+" in SkyDrive " );
throw new FileNotFoundException("Name of " + id
+ " changed from " + name + " to "
+ thisFolder.getName() + " in " + mPath
+ " in SkyDrive ");
parentId = id;
}
}
public String getDisplayName()
{
public String getDisplayName() {
// skydrive://
String displayName = getProtocolPrefix();
@ -183,13 +195,11 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
String[] parts = mPath.split("/");
for (int i=0;i<parts.length;i++)
{
for (int i = 0; i < parts.length; i++) {
String part = parts[i];
// Log.d(TAG, "parsing part " + part);
int indexOfSeparator = part.lastIndexOf(NAME_ID_SEP);
if (indexOfSeparator < 0)
{
if (indexOfSeparator < 0) {
// seems invalid, but we're very generous here
displayName += "/" + part;
continue;
@ -205,18 +215,21 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
return displayName;
}
public String getSkyDriveId() throws InvalidPathException, UnsupportedEncodingException {
public String getSkyDriveId() throws InvalidPathException,
UnsupportedEncodingException {
String pathWithoutTrailingSlash = mPath;
if (pathWithoutTrailingSlash.endsWith("/"))
pathWithoutTrailingSlash = pathWithoutTrailingSlash.substring(0,pathWithoutTrailingSlash.length()-1);
if (pathWithoutTrailingSlash.equals(""))
{
pathWithoutTrailingSlash = pathWithoutTrailingSlash.substring(
0, pathWithoutTrailingSlash.length() - 1);
if (pathWithoutTrailingSlash.equals("")) {
return mRootFolderId;
}
String lastPart = pathWithoutTrailingSlash.substring(pathWithoutTrailingSlash.lastIndexOf(NAME_ID_SEP)+NAME_ID_SEP.length());
String lastPart = pathWithoutTrailingSlash
.substring(pathWithoutTrailingSlash
.lastIndexOf(NAME_ID_SEP) + NAME_ID_SEP.length());
if (lastPart.contains("/"))
throw new InvalidPathException("error extracting SkyDriveId from "+mPath);
throw new InvalidPathException(
"error extracting SkyDriveId from " + mPath);
return decode(lastPart);
}
@ -224,58 +237,126 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
return getProtocolPrefix() + mPath;
}
public SkyDrivePath getParentPath() throws UnsupportedEncodingException, FileNotFoundException, InvalidPathException, LiveOperationException, SkyDriveException {
String pathWithoutTrailingSlash = mPath;
if (pathWithoutTrailingSlash.endsWith("/"))
pathWithoutTrailingSlash = pathWithoutTrailingSlash.substring(
0, pathWithoutTrailingSlash.length() - 1);
if (pathWithoutTrailingSlash.equals(""))
{
return null;
}
int indexOfLastSlash = pathWithoutTrailingSlash.lastIndexOf("/");
if (indexOfLastSlash == -1)
{
return new SkyDrivePath(getProtocolPrefix());
}
String parentPath = pathWithoutTrailingSlash.substring(0, indexOfLastSlash);
return new SkyDrivePath(getProtocolPrefix()+parentPath);
}
public String getFilename() throws InvalidPathException {
String pathWithoutTrailingSlash = mPath;
if (pathWithoutTrailingSlash.endsWith("/"))
pathWithoutTrailingSlash = pathWithoutTrailingSlash.substring(
0, pathWithoutTrailingSlash.length() - 1);
String[] parts = mPath.split("/");
String lastPart = parts[parts.length-1];
int indexOfSeparator = lastPart.lastIndexOf(NAME_ID_SEP);
if (indexOfSeparator < 0) {
throw new InvalidPathException("cannot extract filename from " + mPath);
}
String name = lastPart.substring(0, indexOfSeparator);
try {
name = decode(name);
} catch (UnsupportedEncodingException e) {
// ignore
}
return name;
}
};
public SkyDriveFileStorage(String clientId, Context appContext)
{
public SkyDriveFileStorage(String clientId, Context appContext) {
mAuthClient = new LiveAuthClient(appContext, clientId);
}
void login(final FileStorageSetupActivity activity)
{
mAuthClient.login((Activity)activity,
Arrays.asList(SCOPES),
void login(final FileStorageSetupActivity activity) {
mAuthClient.login((Activity) activity, Arrays.asList(SCOPES),
new LiveAuthListener() {
@Override
public void onAuthComplete(LiveStatus status,
LiveConnectSession session,
Object userState) {
LiveConnectSession session, Object userState) {
if (status == LiveStatus.CONNECTED) {
try
{
initializeSession(session);
finishActivityWithSuccess(activity);
}
catch (Exception e)
{
finishWithError((Activity)activity, e);
}
initialize(activity, session);
} else {
finishWithError((Activity)activity, new Exception("Error connecting to SkdDrive. Status is "+status));
finishWithError((Activity) activity, new Exception(
"Error connecting to SkdDrive. Status is "
+ status));
}
}
@Override
public void onAuthError(LiveAuthException exception, Object userState) {
public void onAuthError(LiveAuthException exception,
Object userState) {
finishWithError((Activity) activity, exception);
}
});
}
private void initializeSession(LiveConnectSession session) throws LiveOperationException, SkyDriveException {
private void initialize(final FileStorageSetupActivity setupAct,
LiveConnectSession session) {
mSession = session;
mConnectClient = new LiveConnectClient(session);
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 {
initializeFoldersCache();
if (setupAct.getProcessName().equals(PROCESS_NAME_SELECTFILE))
setupAct.getState().putString(EXTRA_PATH, getProtocolPrefix());
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 ) {
finishWithError(activity, error);
} else if ( isCancelled()) {
activity.setResult(Activity.RESULT_CANCELED);
activity.finish();
} else {
//all right!
finishActivityWithSuccess(setupAct);
}
}
};
task.execute(new Object[]{});
}
private void initializeFoldersCache() throws LiveOperationException, SkyDriveException {
private void initializeFoldersCache() throws LiveOperationException,
SkyDriveException, FileNotFoundException {
//use alias for now (overwritten later):
mRootFolderId = "me/skydrive";
LiveOperation operation = mConnectClient.get(mRootFolderId + "/files");
@ -287,44 +368,64 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
JSONArray data = result.optJSONArray(JsonKeys.DATA);
for (int i = 0; i < data.length(); i++) {
SkyDriveObject skyDriveObj = SkyDriveObject.create(data.optJSONObject(i));
SkyDriveObject skyDriveObj = SkyDriveObject.create(data
.optJSONObject(i));
if (skyDriveObj == null)
continue; // ignored type
Log.d(TAG, "adding "+skyDriveObj.getName()+" to cache with id " + skyDriveObj.getId()+" in "+skyDriveObj.getParentId());
mFolderCache.put(skyDriveObj.getId(), skyDriveObj);
mRootFolderId = skyDriveObj.getParentId();
}
//check if we received anything. If not: query the root folder directly
if (data.length() == 0)
{
operation = mConnectClient.get(mRootFolderId);
result = operation.getResult();
checkResult(result);
mRootFolderId = SkyDriveObject.create(result).getId();
}
}
private void checkResult(JSONObject result) throws SkyDriveException {
private void checkResult(JSONObject result) throws SkyDriveException, FileNotFoundException {
if (result.has(JsonKeys.ERROR)) {
JSONObject error = result.optJSONObject(JsonKeys.ERROR);
String message = error.optString(JsonKeys.MESSAGE);
String code = error.optString(JsonKeys.CODE);
Log.d(TAG, "Code: "+code);
if ("resource_not_found".equals(code))
throw new FileNotFoundException(message);
else
throw new SkyDriveException(message, code);
}
}
private SkyDriveObject tryAddFileToCache(SkyDrivePath skyDrivePath) {
try
{
LiveOperation operation = mConnectClient.get(skyDrivePath.getSkyDriveId());
JSONObject result = operation.getResult();
checkResult(result);
SkyDriveObject obj = SkyDriveObject.create(result);
if (obj != null)
{
try {
SkyDriveObject obj = getSkyDriveObject(skyDrivePath);
if (obj != null) {
mFolderCache.put(obj.getId(), obj);
}
return obj;
}
catch (Exception e)
{
} catch (Exception e) {
return null;
}
}
private SkyDriveObject getSkyDriveObject(SkyDrivePath skyDrivePath)
throws LiveOperationException, InvalidPathException,
UnsupportedEncodingException, SkyDriveException, FileNotFoundException {
LiveOperation operation = mConnectClient.get(skyDrivePath
.getSkyDriveId());
JSONObject result = operation.getResult();
checkResult(result);
SkyDriveObject obj = SkyDriveObject.create(result);
return obj;
}
@Override
public boolean requiresSetup(String path) {
// always go through the setup process:
@ -335,14 +436,17 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
public void startSelectFile(FileStorageSetupInitiatorActivity activity,
boolean isForSave, int requestCode) {
((JavaFileStorage.FileStorageSetupInitiatorActivity)(activity)).startSelectFileProcess(getProtocolId()+"://", isForSave, requestCode);
((JavaFileStorage.FileStorageSetupInitiatorActivity) (activity))
.startSelectFileProcess(getProtocolId() + "://", isForSave,
requestCode);
}
@Override
public void prepareFileUsage(FileStorageSetupInitiatorActivity activity,
String path, int requestCode) {
((JavaFileStorage.FileStorageSetupInitiatorActivity)(activity)).startFileUsageProcess(path, requestCode);
((JavaFileStorage.FileStorageSetupInitiatorActivity) (activity))
.startFileUsageProcess(path, requestCode);
}
@ -356,60 +460,124 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
return "";
/*
SkyDrivePath skydrivePath = new SkyDrivePath();
try {
skydrivePath.setPathWithoutVerify(path);
} catch (Exception e) {
e.printStackTrace();
return path;
}
return skydrivePath.getDisplayName();*/
* SkyDrivePath skydrivePath = new SkyDrivePath(); try {
* skydrivePath.setPathWithoutVerify(path); } catch (Exception e) {
* e.printStackTrace(); return path; } return
* skydrivePath.getDisplayName();
*/
}
@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
try
{
SkyDrivePath drivePath = new SkyDrivePath(path);
SkyDriveObject obj = getSkyDriveObject(drivePath);
if (obj == null)
return null;
return obj.getUpdatedTime();
}
catch (Exception e)
{
Log.w(TAG,"Error getting file version:");
e.printStackTrace();
return null;
}
}
@Override
public InputStream openFileForRead(String path) throws Exception {
// TODO Auto-generated method stub
return null;
try
{
LiveDownloadOperation op = mConnectClient.download(new SkyDrivePath(path).getSkyDriveId()+"/content");
return op.getStream();
}
catch (Exception e)
{
throw convertException(e);
}
}
@Override
public void uploadFile(String path, byte[] data, boolean writeTransactional)
throws Exception {
// TODO Auto-generated method stub
try
{
SkyDrivePath driveTargetPath = new SkyDrivePath(path);
SkyDrivePath driveUploadPath = driveTargetPath;
SkyDrivePath driveTempPath = null;
ByteArrayInputStream bis = new ByteArrayInputStream(data);
//if writeTransactional, upload the file to a temp destination.
//this is a somewhat ugly way because it requires two uploads, but renaming/copying doesn't work
//nicely in SkyDrive, and SkyDrive doesn't provide file histories by itself, so we need to make sure
//no file gets corrupt if upload is canceled.
if (writeTransactional)
{
LiveOperation uploadOp = uploadFile(driveUploadPath.getParentPath(), driveUploadPath.getFilename()+".tmp", bis);
driveTempPath = new SkyDrivePath(driveUploadPath.getParentPath().getFullPath(), uploadOp.getResult());
//recreate ByteArrayInputStream for use in uploadFile below
bis = new ByteArrayInputStream(data);
}
//upload the file
uploadFile(driveUploadPath.getParentPath(), driveUploadPath.getFilename(), bis);
if (writeTransactional)
{
//delete old file
mConnectClient.delete(driveTempPath.getSkyDriveId());
// don't check result. If delete fails -> not a big deal
}
}
catch (Exception e)
{
throw convertException(e);
}
}
private LiveOperation uploadFile(SkyDrivePath parentPath, String filename, ByteArrayInputStream bis)
throws LiveOperationException, InvalidPathException,
UnsupportedEncodingException, FileNotFoundException,
SkyDriveException {
LiveOperation op = mConnectClient.upload(parentPath.getSkyDriveId(), filename, bis, OverwriteOption.Overwrite);
checkResult(op.getResult());
return op;
}
@Override
public String createFolder(String parentPath, String newDirName)
throws Exception {
try
{
try {
SkyDrivePath skyDriveParentPath = new SkyDrivePath(parentPath);
String parentId = skyDriveParentPath.getSkyDriveId();
JSONObject newFolder = new JSONObject();
newFolder.put("name", newDirName);
newFolder.put("description", "folder");
LiveOperation operation = mConnectClient.put(skyDriveParentPath.getSkyDriveId(), newFolder);
LiveOperation operation = mConnectClient.post(
parentId, newFolder);
JSONObject result = operation.getResult();
checkResult(result);
return new SkyDrivePath(parentPath, result).getFullPath();
}
catch(Exception e)
{
} catch (Exception e) {
throw convertException(e);
}
@ -427,25 +595,108 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
@Override
public String createFilePath(String parentPath, String newFileName)
throws Exception {
// TODO Auto-generated method stub
return null;
try {
SkyDrivePath skyDriveParentPath = new SkyDrivePath(parentPath);
LiveOperation op = uploadFile(skyDriveParentPath, newFileName, new ByteArrayInputStream(new byte[0]));
checkResult(op.getResult());
return new SkyDrivePath(parentPath, op.getResult()).getFullPath();
} catch (Exception e) {
throw convertException(e);
}
}
@Override
public List<FileEntry> listFiles(String parentPath) throws Exception {
// TODO Auto-generated method stub
return null;
try
{
SkyDrivePath parentDrivePath = new SkyDrivePath(parentPath);
LiveOperation operation = mConnectClient.get(parentDrivePath.getSkyDriveId() + "/files");
JSONObject result = operation.getResult();
checkResult(result);
JSONArray data = result.optJSONArray(JsonKeys.DATA);
List<FileEntry> resultList = new ArrayList<FileEntry>(data.length());
for (int i = 0; i < data.length(); i++) {
SkyDriveObject skyDriveObj = SkyDriveObject.create(data
.optJSONObject(i));
if (skyDriveObj == null)
continue; // ignored type
Log.d(TAG, "listing "+skyDriveObj.getName()+" with id " + skyDriveObj.getId()+" in "+skyDriveObj.getParentId());
resultList.add(convertToFileEntry(parentDrivePath, skyDriveObj));
}
return resultList;
}
catch (Exception e)
{
throw convertException(e);
}
}
private FileEntry convertToFileEntry(SkyDrivePath parentPath, SkyDriveObject skyDriveObj) throws UnsupportedEncodingException, FileNotFoundException, IOException, InvalidPathException, JSONException, LiveOperationException, SkyDriveException {
FileEntry res = new FileEntry();
res.canRead = true;
res.canWrite = true;
res.displayName = skyDriveObj.getName();
res.isDirectory = SkyDriveFolder.class.isAssignableFrom(skyDriveObj.getClass());
try
{
res.lastModifiedTime = SKYDRIVE_DATEFORMATTER.parse(skyDriveObj.getUpdatedTime()).getTime();
}
catch (Exception e)
{
Log.w(TAG, "Cannot parse time " + skyDriveObj.getUpdatedTime());
res.lastModifiedTime = -1;
}
if (parentPath == null) //this is the case if we're listing the parent path itself
res.path = getProtocolPrefix();
else
res.path = new SkyDrivePath(parentPath.getFullPath(), skyDriveObj.toJson()).getFullPath();
Log.d(TAG, "path: "+res.path);
if (SkyDriveFile.class.isAssignableFrom(skyDriveObj.getClass()))
{
res.sizeInBytes = ((SkyDriveFile)skyDriveObj).getSize();
}
return res;
}
@Override
public FileEntry getFileEntry(String filename) throws Exception {
// TODO Auto-generated method stub
return null;
try
{
SkyDrivePath drivePath = new SkyDrivePath(filename);
Log.d(TAG, "getFileEntry for "+ filename +" = "+drivePath.getFullPath());
Log.d(TAG, " parent is "+drivePath.getParentPath());
return convertToFileEntry(drivePath.getParentPath(),getSkyDriveObject(drivePath));
}
catch (Exception e)
{
throw convertException(e);
}
}
@Override
public void delete(String path) throws Exception {
// TODO Auto-generated method stub
try
{
SkyDrivePath drivePath = new SkyDrivePath(path);
LiveOperation op = mConnectClient.delete(drivePath.getSkyDriveId());
checkResult(op.getResult());
}
catch (Exception e)
{
throw convertException(e);
}
}
@ -453,17 +704,14 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
public void onCreate(FileStorageSetupActivity activity,
Bundle savedInstanceState) {
}
@Override
public void onResume(FileStorageSetupActivity activity) {
}
private void finishWithError(final Activity activity,
Exception error) {
private void finishWithError(final Activity activity, Exception error) {
Log.e("KP2AJ", "Exception: " + error.toString());
error.printStackTrace();
@ -473,13 +721,13 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
activity.finish();
};
private void finishActivityWithSuccess(FileStorageSetupActivity setupActivity) {
private void finishActivityWithSuccess(
FileStorageSetupActivity setupActivity) {
Log.d("KP2AJ", "Success with authenticating!");
Activity activity = (Activity) setupActivity;
if (setupActivity.getProcessName().equals(PROCESS_NAME_FILE_USAGE_SETUP))
{
if (setupActivity.getProcessName()
.equals(PROCESS_NAME_FILE_USAGE_SETUP)) {
Intent data = new Intent();
data.putExtra(EXTRA_IS_FOR_SAVE, setupActivity.isForSave());
data.putExtra(EXTRA_PATH, setupActivity.getPath());
@ -487,8 +735,7 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
activity.finish();
return;
}
if (setupActivity.getProcessName().equals(PROCESS_NAME_SELECTFILE))
{
if (setupActivity.getProcessName().equals(PROCESS_NAME_SELECTFILE)) {
Intent data = new Intent();
String path = setupActivity.getState().getString(EXTRA_PATH);
@ -501,33 +748,24 @@ public class SkyDriveFileStorage extends JavaFileStorageBase {
Log.w("KP2AJ", "Unknown process: " + setupActivity.getProcessName());
}
@Override
public void onStart(final FileStorageSetupActivity activity) {
mAuthClient.initialize(Arrays.asList(SCOPES), new LiveAuthListener() {
@Override
public void onAuthError(LiveAuthException exception, Object userState) {
public void onAuthError(LiveAuthException exception,
Object userState) {
finishWithError(((Activity) activity), exception);
}
@Override
public void onAuthComplete(LiveStatus status,
LiveConnectSession session,
Object userState) {
LiveConnectSession session, Object userState) {
if (status == LiveStatus.CONNECTED) {
try
{
initializeSession(session);
finishActivityWithSuccess(activity);
}
catch (Exception e)
{
finishWithError((Activity)activity, e);
}
initialize(activity, session);
} else {
login(activity);
}

2
src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveException.java → src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveException.java
View File

@ -1,4 +1,4 @@
package keepass2android.javafilestorage;
package keepass2android.javafilestorage.skydrive;
public class SkyDriveException extends Exception {

3
src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveFile.java → src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveFile.java
View File

@ -1,4 +1,5 @@
package keepass2android.javafilestorage;
package keepass2android.javafilestorage.skydrive;
import org.json.JSONObject;

2
src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveFolder.java → src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveFolder.java
View File

@ -1,4 +1,4 @@
package keepass2android.javafilestorage;
package keepass2android.javafilestorage.skydrive;
import org.json.JSONObject;

3
src/java/JavaFileStorage/src/keepass2android/javafilestorage/SkyDriveObject.java → src/java/JavaFileStorage/src/keepass2android/javafilestorage/skydrive/SkyDriveObject.java
View File

@ -1,4 +1,5 @@
package keepass2android.javafilestorage;
package keepass2android.javafilestorage.skydrive;
import org.json.JSONObject;