fix: iOS Bad URL fix

stravo1 · May 20, 2024 · b18ad17 · b18ad17
1 parent ca94a73
commit b18ad17
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/actions.js b/actions.js
@@ -168,7 +168,7 @@ const getFilesList = async (accessToken, vault) => {
 			url:
 				"https://www.googleapis.com/drive/v3/files" +
 				(vault != null
-					? `?q='${vault}'%20in%20parents&fields=files(name, modifiedTime, mimeType, id)&pageSize=1000`
+					? `?q='${vault}'%20in%20parents&fields=files(name%2CmodifiedTime%2CmimeType%2Cid)&pageSize=1000`
 					: ""),
 			method: "GET",
 			headers: {
@@ -185,7 +185,7 @@ const getFilesList = async (accessToken, vault) => {
 				url:
 					"https://www.googleapis.com/drive/v3/files" +
 					(vault != null
-						? `?q='${vault}'%20in%20parents&fields=files(name, modifiedTime, mimeType, id)&pageSize=1000`
+						? `?q='${vault}'%20in%20parents&fields=files(name%2CmodifiedTime%2CmimeType%2Cid)&pageSize=1000`
 						: "") +
 					`&pageToken=${nextPageToken}`,
 				method: "GET",
@@ -210,8 +210,8 @@ const getFoldersList = async (accessToken, vault = null) => {
 	try {
 		const response = await requestUrl({
 			url:
-				"https://www.googleapis.com/drive/v3/files?q=mimeType%20%3D%20'application%2Fvnd.google-apps.folder'" +
-				(vault != null ? `%20and%20'${vault}'%20in%20parents` : "") + "&fields=files(name, id)&orderBy=createdTime&pageSize=1000",
+				"https://www.googleapis.com/drive/v3/files?q=mimeType%3D%27application%2Fvnd.google-apps.folder%27" +
+				(vault != null ? `%20and%20'${vault}'%20in%20parents` : "") + "&fields=files(name%2Cid)&orderBy=createdTime&pageSize=1000",
 			method: "GET",
 			headers: {
 				Authorization: `Bearer ${accessToken}`,
@@ -225,8 +225,8 @@ const getFoldersList = async (accessToken, vault = null) => {
 		while (isNextPageAvailable) {
 			const response = await requestUrl({
 				url:
-					"https://www.googleapis.com/drive/v3/files?q=mimeType%20%3D%20'application%2Fvnd.google-apps.folder'" +
-					(vault != null ? `%20and%20'${vault}'%20in%20parents` : "") + "&fields=files(name, id)&orderBy=createdTime%20desc&pageSize=1000" +
+					"https://www.googleapis.com/drive/v3/files?q=mimeType%3D%27application%2Fvnd.google-apps.folder%27" +
+					(vault != null ? `%20and%20'${vault}'%20in%20parents` : "") + "&fields=files(name%2Cid)&orderBy=createdTime&pageSize=1000" +
 					`&pageToken=${nextPageToken}`,
 				method: "GET",
 				headers: {

diff --git a/main.ts b/main.ts
@@ -754,6 +754,7 @@ export default class driveSyncPlugin extends Plugin {
 	};
 
 	checkAndEmptySyncQueue = async () => {
+		if (this.haltAllOperations) return;
 		await this.writeToVerboseLogFile(
 			"LOG: Entering checkAndEmptySyncQueue"
 		);
@@ -1080,8 +1081,17 @@ export default class driveSyncPlugin extends Plugin {
 			}
 		} catch (err) {
 			await this.notifyError();
+			await this.writeToVerboseLogFile(
+				"FATAL ERROR: Could not fetch rootFolder"
+			);
 			await this.writeToErrorLogFile(err);
+			await this.writeToErrorLogFile(
+				new Error("FATAL ERROR: Could not fetch rootFolder")
+			);
 			new Notice("FATAL ERROR: Could not fetch rootFolder");
+			await this.writeToVerboseLogFile("LOG: adding settings UI");
+			this.addSettingTab(new syncSettings(this.app, this));
+			return;
 		}
 		// else {
 		// 	// accessToken is not available
@@ -1102,7 +1112,12 @@ export default class driveSyncPlugin extends Plugin {
 				new Notice(
 					"FATAL ERROR: Couldn't get VaultID from Google Drive :("
 				);
+				await this.writeToVerboseLogFile(
+					"FATAL ERROR: Couldn't get VaultID from Google Drive :("
+				);
 				new Notice("Check internet connection and restart plugin.");
+				await this.writeToVerboseLogFile("LOG: adding settings UI");
+				this.addSettingTab(new syncSettings(this.app, this));
 				return;
 			}
 			if (this.settings.vaultId == "NOT FOUND") {