diff --git a/package.json b/package.json index ae39f6d3..1edcd7a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "swdc-vscode", "displayName": "Code Time", - "version": "2.7.11", + "version": "2.7.12", "publisher": "softwaredotcom", "description": "Code Time is an open source plugin that provides programming metrics right in Visual Studio Code.", "author": { @@ -76,10 +76,6 @@ "command": "codetime.registerAccount", "title": "Code Time: Sign up" }, - { - "command": "codetime.disconnectSlackWorkspace", - "title": "Code Time: Disconnect Slack workspace" - }, { "command": "codetime.connectSlack", "title": "Code Time: Connect Slack workspace" diff --git a/src/DataController.ts b/src/DataController.ts index a099816c..f4228b1a 100644 --- a/src/DataController.ts +++ b/src/DataController.ts @@ -38,14 +38,7 @@ export function isRegistered() { export async function getUserPreferences() { currentUser = await getCachedUser() if (currentUser) { - let prefs = currentUser.preferences; - if (prefs && typeof prefs === 'string') { - try { - return JSON.parse(prefs); - } catch (e: any) { - logIt(`Error parsing preferences: ${e.message}`, true); - } - } + return currentUser.preferences_parsed; } return {} } diff --git a/src/command-helper.ts b/src/command-helper.ts index 96f7698f..e90c1399 100644 --- a/src/command-helper.ts +++ b/src/command-helper.ts @@ -152,12 +152,6 @@ export function createCommands( }) ); - cmds.push( - commands.registerCommand('codetime.disconnectSlackWorkspace', (auth_id: any) => { - launchWebUrl(`${app_url}/data_sources/integration_types/slack`); - }) - ); - cmds.push( commands.registerCommand('codetime.enableFlowMode', () => { enableFlow({automated: false}); diff --git a/src/managers/ProgressManager.ts b/src/managers/ProgressManager.ts index 53957868..69961833 100644 --- a/src/managers/ProgressManager.ts +++ b/src/managers/ProgressManager.ts @@ -16,25 +16,6 @@ export class ProgressManager { return ProgressManager.instance; } - - reportProgress(progress: any, increment: number): void { - if (this.doneWriting) { - return; - } - - if (increment < 80) { - increment += 10; - } else if (increment < 90) { - increment += 1; - } - - increment = Math.min(90, increment); - - setTimeout(() => { - progress.report({increment}); - this.reportProgress(progress, increment); - }, 450); - } } export function progressIt(msg: string, asyncFunc: any, args: any[] = []) { diff --git a/src/managers/SyncManger.ts b/src/managers/SyncManger.ts index b2c6ccb1..6bcd83d6 100644 --- a/src/managers/SyncManger.ts +++ b/src/managers/SyncManger.ts @@ -5,15 +5,6 @@ import { commands } from 'vscode'; const fs = require('fs'); -const thirty_seconds: number = 1000 * 30; - -export function passedThreshold(now_in_millis: number, synced_val: number) { - if (!synced_val || now_in_millis - synced_val > thirty_seconds) { - return true; - } - return false; -} - export class SyncManager { private static _instance: SyncManager; diff --git a/swdc-vscode-2.7.11.vsix b/swdc-vscode-2.7.11.vsix deleted file mode 100644 index 6c5a7681..00000000 Binary files a/swdc-vscode-2.7.11.vsix and /dev/null differ diff --git a/swdc-vscode-2.7.12.vsix b/swdc-vscode-2.7.12.vsix new file mode 100644 index 00000000..050a1ee0 Binary files /dev/null and b/swdc-vscode-2.7.12.vsix differ