diff --git a/src/app/core/custom_urls/urls_manager.nim b/src/app/core/custom_urls/urls_manager.nim index 5d1ce9d24b..09c3c95dea 100644 --- a/src/app/core/custom_urls/urls_manager.nim +++ b/src/app/core/custom_urls/urls_manager.nim @@ -8,7 +8,7 @@ import ../../../app_service/service/accounts/utils logScope: topics = "urls-manager" -const StatusInternalLink = "status-im" +const StatusInternalLink = "status-app" const StatusExternalLink = "join.status.im" const UriFormatUserProfile = StatusInternalLink & "://u/" diff --git a/src/app_service/service/message/async_tasks.nim b/src/app_service/service/message/async_tasks.nim index c4a899db3c..a12fe93ffa 100644 --- a/src/app_service/service/message/async_tasks.nim +++ b/src/app_service/service/message/async_tasks.nim @@ -229,7 +229,7 @@ const asyncGetLinkPreviewDataTask: Task = proc(argEncoded: string) {.gcsafe, nim #2. Process whitelisted url #status deep links are handled internally - if domain == "status-im" or domain == "join.status.im": + if domain == "status-app" or domain == "join.status.im": responseJson["success"] = %true responseJson["isStatusDeepLink"] = %true responseJson["result"] = %*{ diff --git a/src/constants.nim b/src/constants.nim index eb1699c1c2..a9269be0bd 100644 --- a/src/constants.nim +++ b/src/constants.nim @@ -48,7 +48,7 @@ type StatusDesktopConfig = object abbr: "d" .}: string uri* {. defaultValue: "" - desc: "status-im:// URI to open a chat or other" + desc: "status-app:// URI to open a chat or other" name: "uri" .}: string diff --git a/status.iss b/status.iss index ab5929e2c6..dc4898713d 100644 --- a/status.iss +++ b/status.iss @@ -74,10 +74,10 @@ Type: files; Name: "{userdesktop}\{#Name}" Type: files; Name: "{commondesktop}\{#Name}" [Registry] -Root: HKCR; Subkey: "status-im"; ValueType: "string"; ValueData: "URL:status-im Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "status-im"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "status-im\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Status.exe,1" -Root: HKCR; Subkey: "status-im\shell\open\command"; ValueType: "string"; ValueData: """{app}\bin\Status.exe"" ""--uri=%1""" +Root: HKCR; Subkey: "status-app"; ValueType: "string"; ValueData: "URL:status-app Protocol"; Flags: uninsdeletekey +Root: HKCR; Subkey: "status-app"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" +Root: HKCR; Subkey: "status-app\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Status.exe,1" +Root: HKCR; Subkey: "status-app\shell\open\command"; ValueType: "string"; ValueData: """{app}\bin\Status.exe"" ""--uri=%1""" [Code] function IsAppRunning(const FileName : string): Boolean; diff --git a/ui/StatusQ/src/StatusQ/Core/Utils/Utils.qml b/ui/StatusQ/src/StatusQ/Core/Utils/Utils.qml index 8762a2e0e8..8b002d8ba4 100644 --- a/ui/StatusQ/src/StatusQ/Core/Utils/Utils.qml +++ b/ui/StatusQ/src/StatusQ/Core/Utils/Utils.qml @@ -156,8 +156,8 @@ QtObject { } function linkifyAndXSS(inputText) { - //URLs starting with http://, https://, ftp:// or status-im:// - var replacePattern1 = /(\b(https?|ftp|status-im):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;\(\)]*[-A-Z0-9+&@#\/%=~_|])/gim; + //URLs starting with http://, https://, ftp:// or status-app:// + var replacePattern1 = /(\b(https?|ftp|status-app):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;\(\)]*[-A-Z0-9+&@#\/%=~_|])/gim; var replacedText = inputText.replace(replacePattern1, "$1"); //URLs starting with "www." (without // before it, or it'd re-link the ones done above). diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml index 509fb919e1..9cf6b5c551 100644 --- a/ui/imports/utils/Constants.qml +++ b/ui/imports/utils/Constants.qml @@ -802,7 +802,7 @@ QtObject { readonly property int repeatHeaderInterval: 2 - readonly property string deepLinkPrefix: 'status-im://' + readonly property string deepLinkPrefix: 'status-app://' readonly property string joinStatusLink: 'join.status.im' readonly property string communityLinkPrefix: 'https://join.status.im/c/' readonly property string userLinkPrefix: 'https://join.status.im/u/'