qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

throw exception in Google Drive implementation as access is blocked by Google currently.

Browse Source
This commit is contained in:
Philipp Crocoll
2021-11-29 10:40:27 +01:00
parent 294e6f5edf
commit eb50ed1bc3
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/GoogleDriveFileStorage.java
View File

@@ -275,19 +275,14 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public String getCurrentFileVersionFast(String path) { public String getCurrentFileVersionFast(String path) {
return null;
try {
GDrivePath gdrivePath = new GDrivePath(path);
return getFileForPath(gdrivePath, getDriveService(gdrivePath.getAccount())).getMd5Checksum();
} catch (Exception e) {
e.printStackTrace();
return null;
}
} }
@Override @Override
public InputStream openFileForRead(String path) throws Exception { public InputStream openFileForRead(String path) throws Exception {
throwAppBlocked();
logDebug("openFileForRead..."); logDebug("openFileForRead...");
GDrivePath gdrivePath = new GDrivePath(path); GDrivePath gdrivePath = new GDrivePath(path);
Drive driveService = getDriveService(gdrivePath.getAccount()); Drive driveService = getDriveService(gdrivePath.getAccount());
@@ -305,9 +300,14 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
} }
} }
private void throwAppBlocked() throws Exception {
throw new Exception("Built-in Google Drive access is currently blocked by Google. Please use Open file > System file picker > Google Drive.");
}
private File getFileForPath(GDrivePath path, Drive driveService) private File getFileForPath(GDrivePath path, Drive driveService)
throws IOException, InvalidPathException { throws Exception {
throwAppBlocked();
logDebug("getFileForPath... "); logDebug("getFileForPath... ");
try try
{ {
@@ -334,7 +334,8 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
} }
private InputStream getFileContent(File driveFile, Drive driveService) throws IOException { private InputStream getFileContent(File driveFile, Drive driveService) throws Exception {
throwAppBlocked();
if (driveFile.getDownloadUrl() != null && driveFile.getDownloadUrl().length() > 0) { if (driveFile.getDownloadUrl() != null && driveFile.getDownloadUrl().length() > 0) {
GenericUrl downloadUrl = new GenericUrl(driveFile.getDownloadUrl()); GenericUrl downloadUrl = new GenericUrl(driveFile.getDownloadUrl());
@@ -352,6 +353,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public void uploadFile(String path, byte[] data, boolean writeTransactional) public void uploadFile(String path, byte[] data, boolean writeTransactional)
throws Exception { throws Exception {
throwAppBlocked();
logDebug("upload file..."); logDebug("upload file...");
try try
{ {
@@ -373,6 +375,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public String createFolder(String parentPath, String newDirName) throws Exception { public String createFolder(String parentPath, String newDirName) throws Exception {
throwAppBlocked();
File body = new File(); File body = new File();
body.setTitle(newDirName); body.setTitle(newDirName);
body.setMimeType(FOLDER_MIME_TYPE); body.setMimeType(FOLDER_MIME_TYPE);
@@ -398,6 +401,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public String createFilePath(String parentPath, String newFileName) throws Exception { public String createFilePath(String parentPath, String newFileName) throws Exception {
throwAppBlocked();
File body = new File(); File body = new File();
body.setTitle(newFileName); body.setTitle(newFileName);
GDrivePath parentGdrivePath = new GDrivePath(parentPath); GDrivePath parentGdrivePath = new GDrivePath(parentPath);
@@ -420,6 +424,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public List<FileEntry> listFiles(String parentPath) throws Exception { public List<FileEntry> listFiles(String parentPath) throws Exception {
throwAppBlocked();
GDrivePath gdrivePath = new GDrivePath(parentPath); GDrivePath gdrivePath = new GDrivePath(parentPath);
String parentId = gdrivePath.getGDriveId(); String parentId = gdrivePath.getGDriveId();
@@ -507,7 +512,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public FileEntry getFileEntry(String filename) throws Exception { public FileEntry getFileEntry(String filename) throws Exception {
throwAppBlocked();
try try
{ {
logDebug("getFileEntry "+filename); logDebug("getFileEntry "+filename);
@@ -527,7 +532,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
@Override @Override
public void delete(String path) throws Exception { public void delete(String path) throws Exception {
throwAppBlocked();
GDrivePath gdrivePath = new GDrivePath(path); GDrivePath gdrivePath = new GDrivePath(path);
Drive driveService = getDriveService(gdrivePath.getAccount()); Drive driveService = getDriveService(gdrivePath.getAccount());
try try
@@ -698,7 +703,8 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
} }
private void initializeAccount(final Context appContext, private void initializeAccount(final Context appContext,
final String accountName) throws IOException { final String accountName) throws Exception {
throwAppBlocked();
logDebug("Init account for " + accountName); logDebug("Init account for " + accountName);
if (!mAccountData.containsKey(accountName)) if (!mAccountData.containsKey(accountName))
{ {
@@ -749,6 +755,7 @@ public class GoogleDriveFileStorage extends JavaFileStorageBase {
public void prepareFileUsage(Context appContext, String path) throws UserInteractionRequiredException, Throwable public void prepareFileUsage(Context appContext, String path) throws UserInteractionRequiredException, Throwable
{ {
throwAppBlocked();
try try
{ {
logDebug("prepareFileUsage " + path + "..."); logDebug("prepareFileUsage " + path + "...");