Replace dcaccount9 with dcaccount

Author: link2xt

packages/e2e-tests/playwright-helper.ts

@@ -168,7 +168,7 @@ export async function createNewProfile(
     if (!chatmailServerDomain) {
       throw new Error('DC_CHATMAIL_DOMAIN env var not set, cannot run tests')
     }
-    dcAccountLink = `dcaccount9:${chatmailServerDomain satisfies string}`
+    dcAccountLink = `dcaccount:${chatmailServerDomain satisfies string}`
   } else {
     if (!mailServerUrl || mailServerToken == undefined) {
       throw new Error(

packages/frontend/src/hooks/useInstantOnboarding.ts

@@ -72,10 +72,10 @@ export default function useInstantOnboarding(): InstantOnboarding {
    */
   const createInstantAccount = useCallback(
     async (accountId: number): Promise<T.FullChat['id'] | null> => {
-      // dcaccount9 is the default QR code which is used if the user
+      // dcaccount is the default QR code which is used if the user
       // didn't scan a code but just clicked the button to create a
       // new account on the welcome screen.
-      let configurationQR = `dcaccount9:${DEFAULT_CHATMAIL_HOSTNAME}`
+      let configurationQR = `dcaccount:${DEFAULT_CHATMAIL_HOSTNAME}`
 
       if (welcomeQr) {
         if (welcomeQr.qr.kind === 'account') {

packages/target-electron/build/gen-electron-builder-config.js

@@ -52,7 +52,7 @@ build['protocols'] = [
   {
     name: 'QR code data',
     role: 'Viewer',
-    schemes: ['openpgp4fpr', 'dcaccount', 'dcaccount9', 'dclogin'],
+    schemes: ['openpgp4fpr', 'dcaccount', 'dclogin'],
   },
   {
     name: 'Send Mails via MailTo Scheme',

packages/target-electron/src/open_url.ts

@@ -17,7 +17,6 @@ if (platform() !== 'linux') {
   app.setAsDefaultProtocolClient('openpgp4fpr')
   app.setAsDefaultProtocolClient('OPENPGP4FPR')
   app.setAsDefaultProtocolClient('dcaccount')
-  app.setAsDefaultProtocolClient('dcaccount9')
   app.setAsDefaultProtocolClient('DCACCOUNT')
   app.setAsDefaultProtocolClient('dclogin')
   app.setAsDefaultProtocolClient('DCLOGIN')

packages/target-tauri/metainfo.xml

@@ -122,7 +122,6 @@
     <mediatype>x-scheme-handler/openpgp4fpr</mediatype>
     <mediatype>x-scheme-handler/mailto</mediatype>
     <mediatype>x-scheme-handler/dcaccount</mediatype>
-    <mediatype>x-scheme-handler/dcaccount9</mediatype>
     <mediatype>x-scheme-handler/dclogin</mediatype>
   </provides>
   <recommends>

packages/target-tauri/src-tauri/Info.plist

@@ -37,7 +37,6 @@
 				<array>
 					<string>openpgp4fpr</string>
 					<string>dcaccount</string>
-					<string>dcaccount9</string>
 					<string>dclogin</string>
 				</array>
 			</dict>

packages/target-tauri/src-tauri/src/deeplink.rs

@@ -60,7 +60,7 @@ pub async fn handle_deep_link(
     if let Some(potential_scheme) = potential_scheme.as_ref() {
         if matches!(
             potential_scheme.as_str(),
-            "openpgp4fpr" | "dcaccount" | "dcaccount9" | "dclogin" | "mailto"
+            "openpgp4fpr" | "dcaccount" | "dclogin" | "mailto"
         ) || (potential_scheme == "https"
             && deeplink_or_xdc.starts_with("https://i.delta.chat/"))
         {
@@ -161,6 +161,5 @@ pub(crate) struct DeepLinkInvocation {
 pub fn register() {
     register_as_default_handler("openpgp4fpr");
     register_as_default_handler("dcaccount");
-    register_as_default_handler("dcaccount9");
     register_as_default_handler("dclogin");
 }

packages/target-tauri/src-tauri/windows/hooks.nsi

@@ -33,7 +33,6 @@
 
     !insertmacro URI_SCHEME "openpgp4fpr"
     !insertmacro URI_SCHEME "dcaccount"
-    !insertmacro URI_SCHEME "dcaccount9"
     !insertmacro URI_SCHEME "dclogin"
     !insertmacro URI_SCHEME "dcnotification"
 !macroend