Merge remote-tracking branch 'origin/dev' into dev

kernel/model/conf.go

@@ -219,7 +219,6 @@ func InitConf() {
 	Conf.System.WorkspaceDir = util.WorkspaceDir
 	Conf.System.DataDir = util.DataDir
 	Conf.System.Container = util.Container
-	util.UserAgent = util.UserAgent + " " + util.Container
 	Conf.System.OS = runtime.GOOS
 	Conf.Newbie = util.IsNewbie
 

kernel/util/working.go

@@ -55,7 +55,6 @@ func Boot() {
 	IncBootProgress(3, "Booting...")
 	rand.Seed(time.Now().UTC().UnixNano())
 	initMime()
-	httpclient.SetUserAgent(UserAgent)
 
 	workspacePath := flag.String("workspace", "", "dir path of the workspace, default to ~/Documents/SiYuan/")
 	wdPath := flag.String("wd", WorkingDir, "working directory of SiYuan")
@@ -84,6 +83,9 @@ func Boot() {
 		Container = "docker"
 	}
 
+	UserAgent = UserAgent + " " + Container
+	httpclient.SetUserAgent(UserAgent)
+
 	initWorkspaceDir(*workspacePath)
 
 	SSL = *ssl

kernel/util/working_mobile.go

@@ -32,7 +32,6 @@ func BootMobile(container, appDir, workspaceDir, nativeLibDir, privateDataDir, l
 	IncBootProgress(3, "Booting...")
 	rand.Seed(time.Now().UTC().UnixNano())
 	initMime()
-	httpclient.SetUserAgent(UserAgent)
 
 	HomeDir = filepath.Join(workspaceDir, "home")
 	userHomeConfDir := filepath.Join(HomeDir, ".config", "siyuan")
@@ -61,6 +60,8 @@ func BootMobile(container, appDir, workspaceDir, nativeLibDir, privateDataDir, l
 	IconsPath = filepath.Join(AppearancePath, "icons")
 	Resident = true
 	Container = container
+	UserAgent = UserAgent + " " + Container
+	httpclient.SetUserAgent(UserAgent)
 	Lang = lang
 	initPathDir()
 	bootBanner := figure.NewFigure("SiYuan", "", true)