Fix issue with Mobile Login (#204)

Fix issue with Hash checking on Mobile
Fix bug when local file deleted.
closes #202

Author: thesamim

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## CHANGELOG
 
+### 1.0.41
+
+Fix issue with Mobile Login
+Fix issue with Hash checking on Mobile
+
+### 1.0.40
+See [New Date/Time handling](https://github.com/thesamim/TickTickSync/wiki/Notable-Changes#changes-from-1036-to-1040----new-datetime-handling) for details.
+Slight performance improvement.
+
 ### 1.0.36
 Keep forgetting to update the change log. Here's everything since the last update. 
 **Full Changelog**: https://github.com/thesamim/TickTickSync/compare/1.0.20...1.0.36

README.md

@@ -106,6 +106,8 @@ Thanks to [LemurTech](https://github.com/LemurTech) and [zarb1n](https://github.
 
 Thanks to [jee-ee](https://github.com/jee-ee) for pointing out the change in Device ID processing.
 
+Thanks to [coneos](https://github.com/coneos) for pointing out the language disparity issue on mobile login.
+
 ## Disclaimer
 
 This plugin was built with the author's specific use cases in mind. Additional use cases can and will be considered.

dist/manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "tickticksync",
 	"name": "TickTickSync",
-	"version": "1.0.40",
+	"version": "1.0.41",
 	"minAppVersion": "1.0.0",
 	"description": "Sync TickTick tasks to Obsidian, and Obsidian tasks to TickTick",
 	"author": "thesamim",

main.ts

@@ -773,8 +773,7 @@ export default class TickTickSync extends Plugin {
 				if (!file) {
 					console.log("File ", fileKey, " was deleted before last sync.");
 					await this.cacheOperation?.deleteFilepathFromMetadata(fileKey);
-					const toDelete = newFilesToSync.findIndex(fileKey)
-					newFilesToSync.splice(toDelete, 1)
+					delete newFilesToSync[fileKey]
 				}
 			}
 

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "tickticksync",
 	"name": "TickTickSync",
-	"version": "1.0.40",
+	"version": "1.0.41",
 	"minAppVersion": "1.0.0",
 	"description": "Sync TickTick tasks to Obsidian, and Obsidian tasks to TickTick",
 	"author": "thesamim",

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "tickticksync",
-	"version": "1.0.40",
+	"version": "1.0.41",
 	"description": "Sync TickTick tasks to Obsidian, and Obsidian tasks to TickTick",
 	"main": "main.js",
 	"scripts": {
@@ -21,13 +21,14 @@
 	"author": "thesamim",
 	"license": "GNU GPLv3",
 	"dependencies": {
-		"obsidian": "latest",
 		"@popperjs/core": "2.11.8",
 		"@types/lowdb": "^1.0.15",
 		"bson-objectid": "2.0.4",
+		"crypto-hash": "^3.1.0",
 		"dependency-tree": "11.0.1",
 		"lodash-es": "^4.17.21",
-		"lowdb": "^7.0.1"
+		"lowdb": "^7.0.1",
+		"obsidian": "latest"
 	},
 	"repository": {
 		"type": "git",

package.json

@@ -631,14 +631,14 @@ export class Tick {
 		const headers = {
 			// 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0',
 			'Accept': '*/*',
-			'Accept-Language': 'en-US,en;q=0.5',
-			'Accept-Encoding': 'gzip, deflate, br, zstd',
-			'X-Csrftoken': '',
+			// 'Accept-Language': 'en-US,en;q=0.5',
+			// 'Accept-Encoding': 'gzip, deflate, br, zstd',
+			// 'X-Csrftoken': '',
 			'x-device': this.deviceAgent,
 			//"x-device": "{\"platform\":\"web\",\"os\":\"Windows 10\",\"device\":\"Firefox 117.0\",\"name\":\"\",\"version\":124.0.6367.243,\"id\":\"124.0.6367.243\",\"channel\":\"website\",\"campaign\":\"\",\"websocket\":\"\"}",
 			'Content-Type': 'application/json',
 			'X-Requested-With': 'XMLHttpRequest',
-			'Cookie' : this.cookieHeader
+			// 'Cookie' : this.cookieHeader
 		};
 
 		// console.log('Login headers', headers);

src/api/index.ts

@@ -332,7 +332,7 @@ export class CacheOperation {
 
         if (!filePath) {
 			//Not a file that's in fileMetaData, not the inbox no default project set
-			let errmsg = `File path not found for ${projectId}, returning ${filePath} instead. `
+			let errmsg = `File path not found for ${projectId}`
 			console.warn(errmsg)
 			throw new Error(errmsg);
 		}
@@ -606,7 +606,7 @@ export class CacheOperation {
 
 
 
-    async getProjectNameByIdFromCache(projectId: string) {
+    async getProjectNameByIdFromCache(projectId: string|null) {
         try {
             const savedProjects = this.plugin.settings.TickTickTasksData.projects
             const targetProject = savedProjects.find(obj => obj.id === projectId);

src/cacheOperation.ts

@@ -243,11 +243,11 @@ export class DateMan {
 			dates.completedTime = this.getDateAndTime(task.completedTime, task.isAllDay, date_emoji.completedTime);
 		}
 		//Pick up the times that TickTick doesn't care about, but Obsidian does.
-		if (oldTask) {
-			if (oldTask.dateHolder.cancelled_date) {
+		if (oldTask && oldTask.dateHolder) {
+			if ('cancelled_date' in oldTask.dateHolder && oldTask.dateHolder.cancelled_date) {
 				dates.cancelled_date = oldTask.dateHolder.cancelled_date;
 			}
-			if (oldTask.dateHolder.createdTime) {
+			if ('createdTime' in oldTask.dateHolder && oldTask.dateHolder.createdTime) {
 				dates.createdTime = oldTask.dateHolder.createdTime;
 			}
 

src/dateMan.ts

@@ -206,7 +206,7 @@ export class SyncMan {
 				let updatedText = await this.updateTaskLine(newTask, lineTxt, editor, cursor, fileContent, line, filePath);
 
 				//we want the line as it is in Obsidian.
-				newTask.lineHash = this.plugin.taskParser?.getLineHash(updatedText);
+				newTask.lineHash = await this.plugin.taskParser?.getLineHash(updatedText);
 				//newTask writes to cache
 				//Will handle meta data there.
 				await this.plugin.cacheOperation?.appendTaskToCache(newTask, filePath)
@@ -318,7 +318,7 @@ export class SyncMan {
 		let bHashCheckFailed;
 		if (this.plugin.taskParser?.hasTickTickId(lineText) && this.plugin.taskParser?.hasTickTickTag(lineText)) {
 
-			const newHash = this.plugin.taskParser?.getLineHash(lineText);
+			const newHash = await this.plugin.taskParser?.getLineHash(lineText);
 			//convertLineToTask has become a pretty expensive operation avoid it.
 			//let's see if the saved task has a lineHash.
 			const lineTask_ticktick_id = this.plugin.taskParser?.getTickTickIdFromLineText(lineText);
@@ -355,7 +355,7 @@ export class SyncMan {
 					await this.plugin.cacheOperation?.updateTaskToCache(savedTask, null);
 				}
 				if (!savedTask.lineHash) {
-					savedTask.lineHash = this.plugin.taskParser?.getLineHash(lineText);
+					savedTask.lineHash = await this.plugin.taskParser?.getLineHash(lineText);
 				}
 			}
 
@@ -598,7 +598,7 @@ export class SyncMan {
 			// from the line in Obsidian. Until I find that corner case, we're just going to reset the line hash here and
 			// be done.
 			if (!modified && bHashCheckFailed) {
-				const updatedHash = this.plugin.taskParser?.getLineHash(lineText)
+				const updatedHash = await this.plugin.taskParser?.getLineHash(lineText)
 				lineTask.lineHash = updatedHash;
 				await this.plugin.cacheOperation?.updateTaskToCache(lineTask, null);
 				await this.plugin.saveSettings();

src/syncModule.ts

@@ -1,6 +1,7 @@
 import { App } from 'obsidian';
 import TickTickSync from '../main';
 import { ITask } from './api/types/Task';
+import {sha256} from 'crypto-hash';
 
 
 interface dataviewTaskObject {
@@ -757,12 +758,11 @@ export class TaskParser {
 		// 	// foo.forEach(tag => console.log(tag));
 	}
 
-	getLineHash(resultLine: string) {
-		// console.time("Line Hash")
-		const crypto = require('crypto');
-		const hash = crypto.createHash("sha256").update(resultLine).digest("hex");
-		// console.log("TRACETHIS hashing: ", resultLine, hash);
-		// console.timeEnd("Line Hash")
-		return hash
+	async getLineHash(resultLine: string) {
+		try {
+			return await sha256(resultLine);
+		} catch (e) {
+			console.error("Hashing error.", e);
+		}
 	}
 }

src/taskParser.ts

@@ -34,6 +34,7 @@
 	"1.0.36": "1.0.0",
 	"1.0.37": "1.0.0",
 	"1.0.38": "1.0.0",
-	"1.0.39": "1.0.0"
-  "1.0.40": "1.0.0"
+	"1.0.39": "1.0.0",
+	"1.0.40": "1.0.0",
+	"1.0.41": "1.0.0"
 }