Merge branch 'develop'

CHANGELOG.txt

@@ -8,6 +8,14 @@ YYYY/MM/DD - MAJOR.MINOR.RELEASE
 [!] = Fix / Security
 
 
+2021/05/27 - 1.0.1
+——————————————————
+[!] Sync icon when logged out
+[+] Reduced memory footprint
+[*] Minor code refactoring
+[*] Better settings change detection
+
+
 2021/05/21 - 1.0.0
 ——————————————————
 [!] Less fatal errors

Lib/autoType.ahk

@@ -10,7 +10,7 @@ autoType(entry, mode)
         {
             if INI.GENERAL.totp
                 Clipboard := entry.totp
-            TrayTip % appTitle, % "TOTP: " formatOtp(entry.totp), 10, 0x20
+            tip("TOTP: " formatOtp(entry.totp))
         }
     }
 

Lib/init.ahk

@@ -18,15 +18,15 @@ init()
         SetTimer bwStatus, -1 ; Async
     }
 
-    if isLocked
+    if !isLogged || isLocked
         ExitApp 1
 
     ; Decrypt data
     getData()
 
     ; Acknowledge
     Menu Tray, Icon, % A_IsCompiled ? A_ScriptFullPath : A_ScriptDir "\assets\bw-at.ico"
-    TrayTip % appTitle, Auto-Type Ready, 10, 0x20
+    tip("Auto-Type Ready")
 
     ; Setup PIN
     if INI.PIN.use = -1 && !INI.PIN.hex && pin := pinSetup()

Lib/settings.ahk

@@ -1,26 +1,26 @@
 
 settings()
 {
-    SetTimer fileUpdate, 1000
-    SplitPath settings, fileName
-    if !WinExist(fileName)
-        Run % "edit " settings
-    WinWait % fileName
-    WinWaitClose % fileName
-    SetTimer fileUpdate, Delete
+    SplitPath settings, filename
+    Run % "edit " settings
+    WinWait % filename
+    SetTimer settings_update, 1000
 }
 
-fileUpdate()
+settings_update()
 {
     static last := 0
     FileGetTime mTime, % settings
-    if !last
+    if !last || WinExist("Secure Password Generator")
         last := mTime
-    if (last != mTime)
+    else if (last != mTime)
     {
         MsgBox % 0x4|0x20|0x40000, % appTitle, Application needs to be reloaded for the changes to take effect. Reload now?
         IfMsgBox Yes
             Reload
         last := mTime
     }
+    SplitPath settings, filename
+    if !WinExist(filename)
+        SetTimer % A_ThisFunc, Delete
 }

Lib/sync.ahk

@@ -8,7 +8,7 @@ sync(showTip := false)
     SetTimer bwStatus, -1
     getData()
     if showTip
-        TrayTip % appTitle, Sync complete, 10, 0x20
+        tip("Sync complete")
 }
 
 sync_auto(mins)

Lib/tip.ahk

@@ -0,0 +1,7 @@
+
+tip(txt)
+{
+    TrayTip % appTitle, % txt, 10, 0x20
+    fn := Func("DllCall").Bind("K32EmptyWorkingSet", "Int",-1)
+    SetTimer % fn, -1000
+}

Lib/toggleLock.ahk

@@ -39,15 +39,15 @@ toggleLock(showTip := false)
         Menu Tray, Icon, % A_IsCompiled ? A_ScriptFullPath : A_ScriptDir "\assets\bw-at.ico"
         isLocked := false
         if showTip
-            TrayTip % appTitle, Vault unlocked, 10, 0x20
+            tip("Vault unlocked")
         return passwd
     }
     else
     {
         Menu Tray, Disable, 1&
         Menu Tray, Rename , 2&, Un&Lock
         if showTip
-            TrayTip % appTitle, Vault locked, 10, 0x20
+            tip("Vault locked")
         Menu Tray, Icon, shell32.dll, 48
         isLocked := true
     }

Lib/toggleLogin.ahk

@@ -5,7 +5,7 @@ toggleLogin(showTip := true)
     if isLogged
     {
         isLogged := false
-        TrayTip % appTitle, Logged out, 10, 0x20
+        tip("Logged out")
         ; Update Menu
         Menu Tray, Disable, 1&
         Menu Tray, Disable, 2&
@@ -55,7 +55,7 @@ toggleLogin(showTip := true)
         Menu Tray, Rename, 3&, Log&out
         Menu Tray, Icon, % A_IsCompiled ? A_ScriptFullPath : A_ScriptDir "\assets\bw-at.ico"
         if showTip
-            TrayTip % appTitle, Logged In, 10, 0x20
+            tip("Logged In")
         return passwd
     }
 }

Lib/update.ahk

@@ -17,14 +17,16 @@ update_isLatest()
     if A_IsCompiled
         FileGetVersion current, % A_ScriptFullPath
     else
-        FileRead current, version
+        FileRead current, % A_ScriptDir "\version"
     try
     {
         whr := ComObjCreate("WinHttp.WinHttpRequest.5.1")
         whr.Open("GET"
             , "https://raw.githubusercontent.com/anonymous1184/bitwarden-autotype/master/version"
             , false), whr.Send()
-        return (current = RTrim(whr.ResponseText, "``r`n"))
+        online := RTrim(whr.ResponseText, "`r`n")
+        return checkVersion(current, online)
+
     }
     return true ; Error while checking
 }

README.md

@@ -130,7 +130,7 @@ This is a script-based utility; not a full-fledged, enterprise-ready application
 [04]: https://bitwarden.com "Bitwarden"
 [05]: https://github.com/anonymous1184/bitwarden-autotype/wiki "Wiki not written yet"
 [06]: https://keepass.info/help/v2/autotype_obfuscation.html "TCATO: Two-Channel Auto-Type Obfuscation"
-[07]: https://i.imgur.com/WeddYxr.png "Entry with Authenticator Key"
+[07]: https://i.imgur.com/Qwv9oKQ.png "Entry with Authenticator Key"
 [08]: https://github.com/bitwarden/cli "Bitwarden CLI"
 [09]: https://github.com/bitwarden/jslib/blob/master/src/models/view/loginUriView.ts#L9 "loginUriView.ts:9"
 [10]: https://github.com/bitwarden/jslib/blob/master/src/angular/components/icon.component.ts#L80 "icon.component.ts:6"

bw-at.ahk

@@ -141,5 +141,5 @@ return ; End of auto-execute
 ;@Ahk2Exe-SetMainIcon %A_ScriptDir%\assets\bw-at.ico
 ;@Ahk2Exe-SetName Bitwarden Auto-Type
 ;@Ahk2Exe-SetOrigFilename bw-at.ahk
-;@Ahk2Exe-SetVersion 1.0.0.1
-;@Ahk2Exe-SetProductVersion 1.0.0.1
+;@Ahk2Exe-SetVersion 1.0.1.1
+;@Ahk2Exe-SetProductVersion 1.0.1.1

setup.ahk

@@ -5,13 +5,11 @@ DetectHiddenWindows On
 
 ; Arguments
 verbose := !quiet := DEBUG := false
-for i,arg in A_Args
-{
-    if arg ~= "i)[-|\/]quiet"
-        verbose := !quiet := true
-    else if arg ~= "i)[-|\/]debug"
-        DEBUG := true
-}
+if A_Args[1] ~= "i)[-|\/]quiet"
+    verbose := !quiet := true
+FileGetVersion version, % A_ScriptFullPath
+if StrSplit(version, ".")[1] > 2020
+    DEBUG := true
 
 ; Check if latest version
 if !DEBUG && !update_isLatest()
@@ -96,15 +94,12 @@ if verbose
 }
 
 ; Progress
-Gui New, +AlwaysOnTop +HwndHwnd +ToolWindow
+Gui New, +AlwaysOnTop +HwndHwnd -SysMenu
 Gui Font, s11 q5, Consolas
 Gui Add, Text,, Getting version...
 Gui Show,, > Download
 Hotkey IfWinActive, % "ahk_id" hWnd
 Hotkey !F4, WinExist
-hMenu := DllCall("User32\GetSystemMenu", "UInt",hWnd, "UInt",0)
-for i,uPosition in { SC_MINIMIZE: 0xF020, SC_CLOSE: 0xF060 }
-    DllCall("User32\DeleteMenu", "UInt",hMenu, "UInt",uPosition, "UInt",0)
 
 ; Latest
 while !latest
@@ -171,6 +166,6 @@ return
 ;@Ahk2Exe-SetMainIcon %A_ScriptDir%\assets\bw-at.ico
 ;@Ahk2Exe-SetName Bitwarden Auto-Type
 ;@Ahk2Exe-SetOrigFilename setup.ahk
-;@Ahk2Exe-SetVersion 1.0.0.1
-;@Ahk2Exe-SetProductVersion 1.0.0.1
+;@Ahk2Exe-SetVersion 1.0.1.1
+;@Ahk2Exe-SetProductVersion 1.0.1.1
 ;@Ahk2Exe-UpdateManifest 1

uninstall.ahk

@@ -85,6 +85,6 @@ Run % ComSpec " /C " quote("timeout /t 1 & del " quote(A_ScriptFullPath)),, Hide
 ;@Ahk2Exe-SetMainIcon %A_ScriptDir%\assets\uninstall.ico
 ;@Ahk2Exe-SetName Bitwarden Auto-Type
 ;@Ahk2Exe-SetOrigFilename uninstall.ahk
-;@Ahk2Exe-SetVersion 1.0.0.1
-;@Ahk2Exe-SetProductVersion 1.0.0.1
+;@Ahk2Exe-SetVersion 1.0.1.1
+;@Ahk2Exe-SetProductVersion 1.0.1.1
 ;@Ahk2Exe-UpdateManifest 1

version

@@ -1 +1 @@
-1.0.0.1
+1.0.1.1