|
@@ -90,17 +90,17 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
|
|
|
public void enumerate(StorageItem storageItem, final StorageServiceClient.EnumerateCompletion enumerateCompletion, final StorageServiceClient.SigninCompletion signinCompletion) {
|
|
|
if (storageItem.path.isEmpty()) {
|
|
|
- OneDriveClient.this.getClient((Activity) context, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
|
|
|
+ getClient((Activity) context, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
|
|
|
public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
|
|
|
if (iOneDriveClient != null) {
|
|
|
StorageServiceClient.SigninCompletion signinCompletion = signinCompletion;
|
|
|
if (signinCompletion != null) {
|
|
|
signinCompletion.onSigninCompletion();
|
|
|
}
|
|
|
- OneDriveClient.this.getRootFolder(iOneDriveClient, enumerateCompletion);
|
|
|
+ getRootFolder(iOneDriveClient, enumerateCompletion);
|
|
|
return;
|
|
|
}
|
|
|
- enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
+ enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
}
|
|
|
});
|
|
|
return;
|
|
@@ -124,12 +124,12 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
}
|
|
|
logOut(iOneDriveClient, new ICallback<Void>() {
|
|
|
public void success(Void voidR) {
|
|
|
- IOneDriveClient unused = OneDriveClient.this.oneDriveClient = null;
|
|
|
+ IOneDriveClient unused = oneDriveClient = null;
|
|
|
}
|
|
|
|
|
|
public void failure(ClientException clientException) {
|
|
|
clientException.printStackTrace();
|
|
|
- IOneDriveClient unused = OneDriveClient.this.oneDriveClient = null;
|
|
|
+ IOneDriveClient unused = oneDriveClient = null;
|
|
|
}
|
|
|
});
|
|
|
return false;
|
|
@@ -148,7 +148,7 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
return getCallbackCollectionPage(new OnOneDriveClientListener() {
|
|
|
public void onNotifyOneDriveClientCollectionPage(List<StorageItem> list) {
|
|
|
if (list != null) {
|
|
|
- list = OneDriveClient.this.getPrintableItems(list);
|
|
|
+ list = getPrintableItems(list);
|
|
|
}
|
|
|
enumerateCompletion.onEnumerateComplete(list, list != null ? StorageServiceClient.ProcessError.NONE : StorageServiceClient.ProcessError.ERROR);
|
|
|
}
|
|
@@ -178,9 +178,9 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
List currentPage = iItemCollectionPage.getCurrentPage();
|
|
|
if (currentPage != null) {
|
|
|
for (int i = 0; i < currentPage.size(); i++) {
|
|
|
- StorageItem access$600 = OneDriveClient.this.getStorageItem((Item) currentPage.get(i));
|
|
|
+ StorageItem access$600 = getStorageItem((Item) currentPage.get(i));
|
|
|
if (access$600 != null) {
|
|
|
- OneDriveClient.this.mStorageItemList.add(access$600);
|
|
|
+ mStorageItemList.add(access$600);
|
|
|
}
|
|
|
}
|
|
|
if (iItemCollectionPage.getNextPage() != null) {
|
|
@@ -188,7 +188,7 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
oneDriveClient.getNextPage(iItemCollectionPage, oneDriveClient.getCallbackCollectionPage(onOneDriveClientListener));
|
|
|
return;
|
|
|
}
|
|
|
- result(OneDriveClient.this.mStorageItemList);
|
|
|
+ result(mStorageItemList);
|
|
|
return;
|
|
|
}
|
|
|
result((List<StorageItem>) null);
|
|
@@ -301,10 +301,10 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
private void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
|
|
|
OneDriveAuthenticator.getOneDriveClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
|
|
|
public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
|
|
|
- IOneDriveClient unused = OneDriveClient.this.oneDriveClient = iOneDriveClient;
|
|
|
+ IOneDriveClient unused = oneDriveClient = iOneDriveClient;
|
|
|
OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener = onOneDriveAuthenticatorListener;
|
|
|
if (onOneDriveAuthenticatorListener != null) {
|
|
|
- onOneDriveAuthenticatorListener.onNotifyOneDriveClient(OneDriveClient.this.oneDriveClient);
|
|
|
+ onOneDriveAuthenticatorListener.onNotifyOneDriveClient(oneDriveClient);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -314,9 +314,9 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
getClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
|
|
|
public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
|
|
|
if (iOneDriveClient != null) {
|
|
|
- OneDriveClient.this.getRootFolder(iOneDriveClient, enumerateCompletion);
|
|
|
+ getRootFolder(iOneDriveClient, enumerateCompletion);
|
|
|
} else {
|
|
|
- enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
+ enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -326,15 +326,15 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
getRoot(iOneDriveClient, new ICallback<Item>() {
|
|
|
public void success(Item item) {
|
|
|
if (item != null) {
|
|
|
- OneDriveClient.this.getItems(iOneDriveClient, item.f323id, enumerateCompletion);
|
|
|
+ getItems(iOneDriveClient, item.f323id, enumerateCompletion);
|
|
|
} else {
|
|
|
- enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
+ enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
public void failure(ClientException clientException) {
|
|
|
clientException.printStackTrace();
|
|
|
- enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
+ enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -525,10 +525,10 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
inputStream = null;
|
|
|
boolean z = false;
|
|
|
bCanceled = false;
|
|
|
- bConvertPdf = OneDriveClient.this.isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || OneDriveClient.this.isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
|
|
|
+ bConvertPdf = isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
|
|
|
if (bConvertPdf && !this.bCanceled) {
|
|
|
try {
|
|
|
- inputStream = OneDriveClient.this.getDownloadInputStreamPdf(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
|
|
|
+ inputStream = getDownloadInputStreamPdf(oneDriveClient, OneDriveDownloader.this.mItemid);
|
|
|
} catch (ClientException e) {
|
|
|
e.printStackTrace();
|
|
|
if (e.isError(OneDriveErrorCodes.NotSupported)) {
|
|
@@ -540,13 +540,13 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
}
|
|
|
if (bConvertPdf && !this.bCanceled) {
|
|
|
try {
|
|
|
- inputStream = OneDriveClient.this.getDownloadInputStream(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
|
|
|
+ inputStream = getDownloadInputStream(oneDriveClient, OneDriveDownloader.this.mItemid);
|
|
|
} catch (ClientException e2) {
|
|
|
e2.printStackTrace();
|
|
|
inputStream = null;
|
|
|
}
|
|
|
}
|
|
|
- String access$1600 = bConvertPdf ? OneDriveClient.this.getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
|
|
|
+ String access$1600 = bConvertPdf ? getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
|
|
|
if (inputStream != null && !this.bCanceled) {
|
|
|
try {
|
|
|
File file = new File(access$1600);
|
|
@@ -614,14 +614,14 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
}
|
|
|
|
|
|
public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
|
|
|
- StorageServiceClient.ProcessError unused = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.NONE;
|
|
|
+ StorageServiceClient.ProcessError unused = mUploadProcessError = StorageServiceClient.ProcessError.NONE;
|
|
|
OneDriveClient oneDriveClient = OneDriveClient.this;
|
|
|
if (!oneDriveClient.isExpired(oneDriveClient.oneDriveClient)) {
|
|
|
mLocalUploader = new LocalUploader(mActivity, mOrgFilePath, mUploadPath, uploadCompletion);
|
|
|
AsyncTask.THREAD_POOL_EXECUTOR.execute(mLocalUploader);
|
|
|
return;
|
|
|
}
|
|
|
- StorageServiceClient.ProcessError unused2 = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.RETRY;
|
|
|
+ StorageServiceClient.ProcessError unused2 = mUploadProcessError = StorageServiceClient.ProcessError.RETRY;
|
|
|
uploadCompletion.onUploadComplete("", "", StorageServiceClient.ProcessError.RETRY);
|
|
|
}
|
|
|
|
|
@@ -675,13 +675,13 @@ public class OneDriveClient extends StorageServiceClient {
|
|
|
private void upload(int i) {
|
|
|
uploadSession = null;
|
|
|
try {
|
|
|
- uploadSession = OneDriveClient.this.getUploadSession(OneDriveClient.this.oneDriveClient, "/Epson iPrint/" + mUploadFilename);
|
|
|
+ uploadSession = getUploadSession(oneDriveClient, "/Epson iPrint/" + mUploadFilename);
|
|
|
} catch (ClientException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
UploadSession uploadSession2 = uploadSession;
|
|
|
if (uploadSession2 != null) {
|
|
|
- OneDriveClient.this.uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
|
|
|
+ uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
|
|
|
public void success(Item item) {
|
|
|
boolean unused = LocalUploader.this.result = true;
|
|
|
}
|