PS-1174 Fixed Formatting

.github/workflows/build.yml

@@ -440,7 +440,7 @@ jobs:
 
   ios:
     name: Apple iOS
-    runs-on: macos-12
+    runs-on: macos-11
     needs: setup
     steps:
       - name: Setup NuGet
@@ -503,8 +503,6 @@ jobs:
           gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
             --output $HOME/secrets/dist_watch_app_extension.mobileprovision \
             ./.github/secrets/dist_watch_app_extension.mobileprovision.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPT_FILE_PASSWORD" \
-            --output ./src/watchOS/bitwarden/GoogleService-Info.plist ./.github/secrets/GoogleService-Info.plist.gpg
         shell: bash
 
       - name: Increment version
@@ -592,6 +590,9 @@ jobs:
           echo "########################################"
           echo "##### Done"
           echo "########################################"
+          cd src/watchOS
+          ls -R
+          cd ../..
         shell: bash
 
       - name: Restore packages
@@ -629,12 +630,7 @@ jobs:
           ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs"
           EXPORT_PATH="./bitwarden-export"
 
-          WATCH_ARCHIVE_DSYMS_PATH="./src/watchOS/bitwarden.xcarchive/dSYMs/"
-          WATCH_DSYMS_EXPORT_PATH="$EXPORT_PATH/Watch_dSYMs"
-
-          cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH
-          mkdir $WATCH_DSYMS_EXPORT_PATH
-          cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH
+          cp -r $ARCHIVE_DSYMS_PATH $EXPORT_PATH
         shell: bash
 
       - name: Upload App Store .ipa & dSYMs artifacts
@@ -667,22 +663,6 @@ jobs:
         run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN
         shell: bash
 
-      - name: Upload Watch dSYMs to Firebase Crashlytics
-        if: |
-            (github.ref == 'refs/heads/master'
-              && needs.setup.outputs.rc_branch_exists == 0
-              && needs.setup.outputs.hotfix_branch_exists == 0)
-            || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0)
-            || github.ref == 'refs/heads/hotfix-rc'
-        run: |
-
-          echo "########################################"
-          echo "##### Uploading Watch dSYMs to Firebase"
-          echo "########################################"
-
-          find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;
-        shell: bash
-
       - name: Deploy to App Store
         if: |
             (github.ref == 'refs/heads/master'

src/Android/Accessibility/AccessibilityHelpers.cs

@@ -67,7 +67,6 @@ namespace Bit.Droid.Accessibility
             new Browser("com.mmbox.xbrowser", "search_box"),
             new Browser("com.mycompany.app.soulbrowser", "edit_text"),
             new Browser("com.naver.whale", "url_bar"),
-            new Browser("com.neeva.app", "full_url_text_view"),
             new Browser("com.opera.browser", "url_field"),
             new Browser("com.opera.browser.beta", "url_field"),
             new Browser("com.opera.gx", "addressbarEdit"),
@@ -92,7 +91,6 @@ namespace Bit.Droid.Accessibility
             new Browser("io.github.forkmaintainers.iceraven", "mozac_browser_toolbar_url_view"),
             new Browser("mark.via", "am,an"),
             new Browser("mark.via.gp", "as"),
-            new Browser("net.dezor.browser", "url_bar"),
             new Browser("net.slions.fulguris.full.download", "search"),
             new Browser("net.slions.fulguris.full.download.debug", "search"),
             new Browser("net.slions.fulguris.full.playstore", "search"),
@@ -132,7 +130,6 @@ namespace Bit.Droid.Accessibility
             new Browser("com.htc.sense.browser", "title"),
             new Browser("com.jerky.browser2", "enterUrl"),
             new Browser("com.ksmobile.cb", "address_bar_edit_text"),
-            new Browser("com.lemurbrowser.exts","url_bar"),
             new Browser("com.linkbubble.playstore", "url_text"),
             new Browser("com.mx.browser", "address_editor_with_progress"),
             new Browser("com.mx.browser.tablet", "address_editor_with_progress"),

src/Android/Autofill/AutofillHelpers.cs

@@ -79,7 +79,6 @@ namespace Bit.Droid.Autofill
             "com.jamal2367.styx",
             "com.kiwibrowser.browser",
             "com.kiwibrowser.browser.dev",
-            "com.lemurbrowser.exts",
             "com.microsoft.emmx",
             "com.microsoft.emmx.beta",
             "com.microsoft.emmx.canary",
@@ -88,7 +87,6 @@ namespace Bit.Droid.Autofill
             "com.mmbox.xbrowser",
             "com.mycompany.app.soulbrowser",
             "com.naver.whale",
-            "com.neeva.app",
             "com.opera.browser",
             "com.opera.browser.beta",
             "com.opera.gx",
@@ -112,7 +110,6 @@ namespace Bit.Droid.Autofill
             "io.github.forkmaintainers.iceraven",
             "mark.via",
             "mark.via.gp",
-            "net.dezor.browser",
             "net.slions.fulguris.full.download",
             "net.slions.fulguris.full.download.debug",            
             "net.slions.fulguris.full.playstore",

src/Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.1.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2022.12.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />
@@ -40,16 +40,4 @@
 			</intent-filter>
 		</activity>
 	</application>
-	<!-- Support for Xamarin.Essentials.Browser.OpenAsync  (for Android > 11) -->
-	<!-- Related docs: https://learn.microsoft.com/en-us/xamarin/essentials/open-browser?tabs=android -->
-	<queries>
-		<intent>
-			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="http"/>
-		</intent>
-		<intent>
-			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="https"/>
-		</intent>
-	</queries>
 </manifest>

src/Android/Resources/xml/autofillservice.xml

@@ -92,9 +92,6 @@
   <compatibility-package
     android:name="com.kiwibrowser.browser.dev"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.lemurbrowser.exts"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.microsoft.emmx"
     android:maxLongVersionCode="10000000000"/>
@@ -119,9 +116,6 @@
   <compatibility-package
     android:name="com.naver.whale"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="com.neeva.app"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="com.opera.browser"
     android:maxLongVersionCode="10000000000"/>
@@ -191,9 +185,6 @@
   <compatibility-package
     android:name="mark.via.gp"
     android:maxLongVersionCode="10000000000"/>
-  <compatibility-package
-    android:name="net.dezor.browser"
-    android:maxLongVersionCode="10000000000"/>
   <compatibility-package
     android:name="net.slions.fulguris.full.download"
     android:maxLongVersionCode="10000000000"/>

src/Android/Services/LocalizeService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -26,13 +25,13 @@ namespace Bit.Droid.Services
                 try
                 {
                     var fallback = ToDotnetFallbackLanguage(new PlatformCulture(netLanguage));
-                    Debug.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
+                    Console.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
                     ci = new CultureInfo(fallback);
                 }
                 catch (CultureNotFoundException e2)
                 {
                     // iOS language not valid .NET culture, falling back to English
-                    Debug.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
+                    Console.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
                     ci = new CultureInfo("en");
                 }
             }
@@ -41,7 +40,7 @@ namespace Bit.Droid.Services
 
         private string AndroidToDotnetLanguage(string androidLanguage)
         {
-            Debug.WriteLine("Android Language:" + androidLanguage);
+            Console.WriteLine("Android Language:" + androidLanguage);
             var netLanguage = androidLanguage;
             if (androidLanguage.StartsWith("zh"))
             {
@@ -80,13 +79,13 @@ namespace Bit.Droid.Services
                         // ONLY use cultures that have been tested and known to work
                 }
             }
-            Debug.WriteLine(".NET Language/Locale:" + netLanguage);
+            Console.WriteLine(".NET Language/Locale:" + netLanguage);
             return netLanguage;
         }
 
         private string ToDotnetFallbackLanguage(PlatformCulture platCulture)
         {
-            Debug.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
+            Console.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
             var netLanguage = platCulture.LanguageCode; // use the first part of the identifier (two chars, usually);
             switch (platCulture.LanguageCode)
             {
@@ -96,7 +95,7 @@ namespace Bit.Droid.Services
                     // add more application-specific cases here (if required)
                     // ONLY use cultures that have been tested and known to work
             }
-            Debug.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
+            Console.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
             return netLanguage;
         }
 

src/App/Resources/AppResources.ar.resx

@@ -118,17 +118,17 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
-    <value>عن التطبيق</value>
+    <value>حول</value>
   </data>
   <data name="Add" xml:space="preserve">
-    <value>أضِف</value>
+    <value>إضافة</value>
     <comment>Add/create a new entity (verb).</comment>
   </data>
   <data name="AddFolder" xml:space="preserve">
-    <value>مجلد مضاف</value>
+    <value>إضافة مجلد</value>
   </data>
   <data name="AddItem" xml:space="preserve">
-    <value>تمت إضافة العنصر</value>
+    <value>إضافة عنصر</value>
     <comment>The title for the add item page.</comment>
   </data>
   <data name="AnErrorHasOccurred" xml:space="preserve">
@@ -2451,7 +2451,7 @@
     <value>عشوائي</value>
   </data>
   <data name="ConnectToWatch" xml:space="preserve">
-    <value>متّصل بالسّاعة</value>
+    <value>Connect to Watch</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>كشف خدمة إمكانية الوصول</value>

src/App/Resources/AppResources.fr.resx

@@ -425,10 +425,10 @@
     <value>Service de remplissage automatique</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
-    <value>Éviter les caractères ambigus</value>
+    <value>Évitez les caractères ambigus</value>
   </data>
   <data name="BitwardenAppExtension" xml:space="preserve">
-    <value>Extension de l'application Bitwarden</value>
+    <value>Extension de l'application bitwarden</value>
   </data>
   <data name="BitwardenAppExtensionAlert2" xml:space="preserve">
     <value>Le meilleur moyen d'ajouter de nouveaux sites à votre coffre est d'utiliser l'extension de l'application Bitwarden. Parcourez le menu "Paramètres" pour en apprendre davantage.</value>
@@ -468,7 +468,7 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="EditItem" xml:space="preserve">
-    <value>Modifier l'élément</value>
+    <value>Modifier l'Élément</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
     <value>Activer la synchronisation automatique</value>
@@ -692,10 +692,10 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="SyncingComplete" xml:space="preserve">
-    <value>Synchronisation terminée</value>
+    <value>Synchronisation terminée.</value>
   </data>
   <data name="SyncingFailed" xml:space="preserve">
-    <value>Échec de la synchronisation</value>
+    <value>Échec de la synchronisation.</value>
   </data>
   <data name="SyncVaultNow" xml:space="preserve">
     <value>Synchroniser le coffre maintenant</value>

src/App/Resources/AppResources.sv.resx

@@ -2452,7 +2452,7 @@ välj Lägg till TOTP för att lagra nyckeln på ett säkert sätt</value>
     <value>Slumpmässig</value>
   </data>
   <data name="ConnectToWatch" xml:space="preserve">
-    <value>Anslut till Watch</value>
+    <value>Connect to Watch</value>
   </data>
   <data name="AccessibilityServiceDisclosure" xml:space="preserve">
     <value>Delgivning av tillgänglighetstjänst</value>
@@ -2514,6 +2514,6 @@ Vill du byta till detta konto?</value>
     <value>Denna förfrågan är inte längre giltig</value>
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
-    <value>Bevilja kamerabehörighet för att använda skannern</value>
+    <value>Enable camera permission to use the scanner</value>
   </data>
 </root>

src/Core/Services/SearchService.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
@@ -85,6 +87,10 @@ namespace Bit.Core.Services
                 {
                     matchedCiphers.Add(c);
                 }
+                else if (RemoveDiacritics(c.Name)?.ToLower().Contains(query) ?? false)
+                {
+                    lowPriorityMatchedCiphers.Add(c);
+                }
                 else if (query.Length >= 8 && c.Id.StartsWith(query))
                 {
                     lowPriorityMatchedCiphers.Add(c);
@@ -93,6 +99,10 @@ namespace Bit.Core.Services
                 {
                     lowPriorityMatchedCiphers.Add(c);
                 }
+                else if (RemoveDiacritics(c.SubTitle)?.ToLower().Contains(query) ?? false)
+                {
+                    lowPriorityMatchedCiphers.Add(c);
+                }
                 else if (c.Login?.Uri?.ToLower()?.Contains(query) ?? false)
                 {
                     lowPriorityMatchedCiphers.Add(c);
@@ -165,5 +175,27 @@ namespace Bit.Core.Services
             matchedSends.AddRange(lowPriorityMatchSends);
             return matchedSends;
         }
+
+        private string RemoveDiacritics(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return null;
+            }
+
+            string formD = text.Normalize(NormalizationForm.FormD);
+            StringBuilder sb = new StringBuilder();
+
+            foreach (char ch in formD)
+            {
+                UnicodeCategory uc = CharUnicodeInfo.GetUnicodeCategory(ch);
+                if (uc != UnicodeCategory.NonSpacingMark)
+                {
+                    sb.Append(ch);
+                }
+            }
+
+            return sb.ToString().Normalize(NormalizationForm.FormC);
+        }
     }
 }

src/iOS.Autofill/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.autofill</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.1.0</string>
+	<string>2022.12.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleLocalizations</key>

src/iOS.Core/Services/LocalizeService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using Bit.App.Abstractions;
 using Bit.App.Models;
@@ -32,13 +31,13 @@ namespace Bit.iOS.Core.Services
                 try
                 {
                     var fallback = ToDotnetFallbackLanguage(new PlatformCulture(netLanguage));
-                    Debug.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
+                    Console.WriteLine(netLanguage + " failed, trying " + fallback + " (" + e1.Message + ")");
                     ci = new CultureInfo(fallback);
                 }
                 catch (CultureNotFoundException e2)
                 {
                     // iOS language not valid .NET culture, falling back to English
-                    Debug.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
+                    Console.WriteLine(netLanguage + " couldn't be set, using 'en' (" + e2.Message + ")");
                     ci = new CultureInfo("en");
                 }
             }
@@ -48,7 +47,7 @@ namespace Bit.iOS.Core.Services
 
         private string iOSToDotnetLanguage(string iOSLanguage)
         {
-            Debug.WriteLine("iOS Language:" + iOSLanguage);
+            Console.WriteLine("iOS Language:" + iOSLanguage);
             var netLanguage = iOSLanguage;
             if (iOSLanguage.StartsWith("zh-Hant") || iOSLanguage.StartsWith("zh-HK"))
             {
@@ -78,13 +77,13 @@ namespace Bit.iOS.Core.Services
                 }
             }
 
-            Debug.WriteLine(".NET Language/Locale:" + netLanguage);
+            Console.WriteLine(".NET Language/Locale:" + netLanguage);
             return netLanguage;
         }
 
         private string ToDotnetFallbackLanguage(PlatformCulture platCulture)
         {
-            Debug.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
+            Console.WriteLine(".NET Fallback Language:" + platCulture.LanguageCode);
             // Use the first part of the identifier (two chars, usually);
             var netLanguage = platCulture.LanguageCode;
             switch (platCulture.LanguageCode)
@@ -98,7 +97,7 @@ namespace Bit.iOS.Core.Services
                     // add more application-specific cases here (if required)
                     // ONLY use cultures that have been tested and known to work
             }
-            Debug.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
+            Console.WriteLine(".NET Fallback Language/Locale:" + netLanguage + " (application-specific)");
             return netLanguage;
         }
 

src/iOS.Core/Views/Toast.cs

@@ -1,7 +1,6 @@
 using Bit.App.Utilities;
 using Foundation;
 using System;
-using System.Diagnostics;
 using UIKit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
@@ -111,7 +110,7 @@ namespace Bit.iOS.Core.Views
             }
             else
             {
-                Debug.WriteLine("Toast needs a keyWindows to display.");
+                Console.WriteLine("Toast needs a keyWindows to display.");
             }
         }
 

src/iOS.Extension/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden.find-login-action-extension</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.1.0</string>
+	<string>2022.12.0</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

src/iOS.ShareExtension/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.1.0</string>
+	<string>2022.12.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>MinimumOSVersion</key>

src/iOS/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.8bit.bitwarden</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.1.0</string>
+	<string>2022.12.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleIconName</key>

src/watchOS/bitwarden/GoogleService-Info.plist

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>___________</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>___________</string>
-	<key>API_KEY</key>
-	<string>___________</string>
-	<key>GCM_SENDER_ID</key>
-	<string>___________</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.8bit.bitwarden.watchkitapp.watchkitextension</string>
-	<key>PROJECT_ID</key>
-	<string>___________</string>
-	<key>STORAGE_BUCKET</key>
-	<string>___________</string>
-	<key>IS_ADS_ENABLED</key>
-	<false/>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false/>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true/>
-	<key>IS_GCM_ENABLED</key>
-	<true/>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true/>
-	<key>GOOGLE_APP_ID</key>
-	<string>___________</string>
-</dict>
-</plist>

src/watchOS/bitwarden/bitwarden WatchKit Extension/ExtensionDelegate.swift

@@ -1,11 +0,0 @@
-import WatchKit
-import FirebaseCore
-
-class ExtensionDelegate: NSObject, WKExtensionDelegate {
-
-    func applicationDidFinishLaunching() {
-#if !DEBUG
-        FirebaseApp.configure()
-#endif
-    }
-}

src/watchOS/bitwarden/bitwarden WatchKit Extension/Services/CryptoService.swift

@@ -34,7 +34,7 @@ public class CryptoService{
             let item = try JSONDecoder().decode(type, from: decryptedData)
             return item
         } catch {
-            Log.e("Fail to decode item for keychain: \(error)")
+            assertionFailure("Fail to decode item for keychain: \(error)")
             return nil
         }
     }

src/watchOS/bitwarden/bitwarden WatchKit Extension/bitwardenApp.swift

@@ -1,9 +1,7 @@
 import SwiftUI
 
 @main
-struct bitwardenApp: App {
-    @WKExtensionDelegateAdaptor(ExtensionDelegate.self) var delegate
-    
+struct bitwardenApp: App {    
     @SceneBuilder var body: some Scene {
         WindowGroup {
             NavigationView {

src/watchOS/bitwarden/bitwarden.xcodeproj/project.pbxproj

@@ -35,11 +35,6 @@
 		1B59EC632901B1C100A8718D /* LoggerHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B59EC622901B1C100A8718D /* LoggerHelper.swift */; };
 		1B5AFF0329196C81004478F9 /* ColorUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B5AFF0229196C81004478F9 /* ColorUtils.swift */; };
 		1B5AFF0729197822004478F9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1B5AFF0929197822004478F9 /* Localizable.strings */; };
-		1B5BE451295A08A900E0C323 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 1B5BE450295A08A900E0C323 /* FirebaseCrashlytics */; };
-		1B5BE453295A08C600E0C323 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B5BE452295A08C600E0C323 /* ExtensionDelegate.swift */; };
-		1B5BE45E295B472C00E0C323 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1B5BE45D295B472C00E0C323 /* GoogleService-Info.plist */; };
-		1B5BE45F295B472C00E0C323 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1B5BE45D295B472C00E0C323 /* GoogleService-Info.plist */; };
-		1B5BE460295B472C00E0C323 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1B5BE45D295B472C00E0C323 /* GoogleService-Info.plist */; };
 		1B5F5E38293F9CF8009B5FCC /* TrackableWithHeaderListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B5F5E37293F9CF8009B5FCC /* TrackableWithHeaderListView.swift */; };
 		1B5F5E3A293F9D6F009B5FCC /* ViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B5F5E39293F9D6F009B5FCC /* ViewExtensions.swift */; };
 		1B5F5E3E293FBB17009B5FCC /* CipherItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B5F5E3D293FBB17009B5FCC /* CipherItemView.swift */; };
@@ -149,8 +144,6 @@
 		1B59EC622901B1C100A8718D /* LoggerHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggerHelper.swift; sourceTree = "<group>"; };
 		1B5AFF0229196C81004478F9 /* ColorUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorUtils.swift; sourceTree = "<group>"; };
 		1B5AFF0829197822004478F9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		1B5BE452295A08C600E0C323 /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = "<group>"; };
-		1B5BE45D295B472C00E0C323 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		1B5F5E37293F9CF8009B5FCC /* TrackableWithHeaderListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackableWithHeaderListView.swift; sourceTree = "<group>"; };
 		1B5F5E39293F9D6F009B5FCC /* ViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewExtensions.swift; sourceTree = "<group>"; };
 		1B5F5E3D293FBB17009B5FCC /* CipherItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CipherItemView.swift; sourceTree = "<group>"; };
@@ -197,7 +190,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1B5BE451295A08A900E0C323 /* FirebaseCrashlytics in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -238,7 +230,6 @@
 		1B15612628B7F3D400610B9B = {
 			isa = PBXGroup;
 			children = (
-				1B5BE45D295B472C00E0C323 /* GoogleService-Info.plist */,
 				1B15613128B7F3D400610B9B /* bitwarden */,
 				1B15614128B7F3D700610B9B /* bitwarden WatchKit App */,
 				1B15614C28B7F3D800610B9B /* bitwarden WatchKit Extension */,
@@ -307,7 +298,6 @@
 				1B15615D28B7F3D900610B9B /* PushNotificationPayload.apns */,
 				1B15615928B7F3D900610B9B /* Preview Content */,
 				1B15616D28B81A4300610B9B /* WatchConnectivityManager.swift */,
-				1B5BE452295A08C600E0C323 /* ExtensionDelegate.swift */,
 			);
 			path = "bitwarden WatchKit Extension";
 			sourceTree = "<group>";
@@ -480,9 +470,6 @@
 			dependencies = (
 			);
 			name = "bitwarden WatchKit Extension";
-			packageProductDependencies = (
-				1B5BE450295A08A900E0C323 /* FirebaseCrashlytics */,
-			);
 			productName = "bitwarden WatchKit Extension";
 			productReference = 1B15614828B7F3D800610B9B /* bitwarden WatchKit Extension.appex */;
 			productType = "com.apple.product-type.watchkit2-extension";
@@ -517,9 +504,6 @@
 				Base,
 			);
 			mainGroup = 1B15612628B7F3D400610B9B;
-			packageReferences = (
-				1B5BE44F295A08A900E0C323 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
-			);
 			productRefGroup = 1B15613028B7F3D400610B9B /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -538,7 +522,6 @@
 			files = (
 				1B15613A28B7F3D700610B9B /* Preview Assets.xcassets in Resources */,
 				1B15613728B7F3D700610B9B /* Assets.xcassets in Resources */,
-				1B5BE45E295B472C00E0C323 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -547,7 +530,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				1B15614328B7F3D800610B9B /* Assets.xcassets in Resources */,
-				1B5BE45F295B472C00E0C323 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -556,7 +538,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				1B15615B28B7F3D900610B9B /* Preview Assets.xcassets in Resources */,
-				1B5BE460295B472C00E0C323 /* GoogleService-Info.plist in Resources */,
 				1B5AFF0729197822004478F9 /* Localizable.strings in Resources */,
 				1B15615828B7F3D900610B9B /* Assets.xcassets in Resources */,
 			);
@@ -619,7 +600,6 @@
 				1B15616E28B81A4300610B9B /* WatchConnectivityManager.swift in Sources */,
 				1B5AFF0329196C81004478F9 /* ColorUtils.swift in Sources */,
 				1B59EC612900C48E00A8718D /* KeychainHelper.swift in Sources */,
-				1B5BE453295A08C600E0C323 /* ExtensionDelegate.swift in Sources */,
 				1B59EC5729007DEE00A8718D /* BitwardenDB.xcdatamodeld in Sources */,
 				1B8BF90D2919BED9006F069E /* Base32.swift in Sources */,
 				1B8453EC290C672E00F921E1 /* CipherEntity+CoreDataClass.swift in Sources */,
@@ -847,7 +827,6 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = LTZ2PFU5D6;
 				GENERATE_INFOPLIST_FILE = YES;
 				IBSC_MODULE = bitwarden_WatchKit_Extension;
@@ -1005,25 +984,6 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCRemoteSwiftPackageReference section */
-		1B5BE44F295A08A900E0C323 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
-			requirement = {
-				kind = exactVersion;
-				version = 9.6.0;
-			};
-		};
-/* End XCRemoteSwiftPackageReference section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		1B5BE450295A08A900E0C323 /* FirebaseCrashlytics */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 1B5BE44F295A08A900E0C323 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
-			productName = FirebaseCrashlytics;
-		};
-/* End XCSwiftPackageProductDependency section */
-
 /* Begin XCVersionGroup section */
 		1B59EC5529007DEE00A8718D /* BitwardenDB.xcdatamodeld */ = {
 			isa = XCVersionGroup;

src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,113 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "abseil-cpp-swiftpm",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
-      "state" : {
-        "revision" : "583de9bd60f66b40e78d08599cc92036c2e7e4e1",
-        "version" : "0.20220203.2"
-      }
-    },
-    {
-      "identity" : "boringssl-swiftpm",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/boringssl-SwiftPM.git",
-      "state" : {
-        "revision" : "dd3eda2b05a3f459fc3073695ad1b28659066eab",
-        "version" : "0.9.1"
-      }
-    },
-    {
-      "identity" : "firebase-ios-sdk",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/firebase-ios-sdk",
-      "state" : {
-        "revision" : "7e80c25b51c2ffa238879b07fbfc5baa54bb3050",
-        "version" : "9.6.0"
-      }
-    },
-    {
-      "identity" : "googleappmeasurement",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/GoogleAppMeasurement.git",
-      "state" : {
-        "revision" : "c1cfde8067668027b23a42c29d11c246152fe046",
-        "version" : "9.6.0"
-      }
-    },
-    {
-      "identity" : "googledatatransport",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/GoogleDataTransport.git",
-      "state" : {
-        "revision" : "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8",
-        "version" : "9.2.0"
-      }
-    },
-    {
-      "identity" : "googleutilities",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/GoogleUtilities.git",
-      "state" : {
-        "revision" : "6db6edb48bdd9943426562c7f042a5492de5ba3d",
-        "version" : "7.10.0"
-      }
-    },
-    {
-      "identity" : "grpc-ios",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/grpc/grpc-ios.git",
-      "state" : {
-        "revision" : "8440b914756e0d26d4f4d054a1c1581daedfc5b6",
-        "version" : "1.44.3-grpc"
-      }
-    },
-    {
-      "identity" : "gtm-session-fetcher",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/gtm-session-fetcher.git",
-      "state" : {
-        "revision" : "5ccda3981422a84186387dbb763ba739178b529c",
-        "version" : "2.3.0"
-      }
-    },
-    {
-      "identity" : "leveldb",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/leveldb.git",
-      "state" : {
-        "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
-        "version" : "1.22.2"
-      }
-    },
-    {
-      "identity" : "nanopb",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/nanopb.git",
-      "state" : {
-        "revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
-        "version" : "2.30909.0"
-      }
-    },
-    {
-      "identity" : "promises",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/promises.git",
-      "state" : {
-        "revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb",
-        "version" : "2.1.1"
-      }
-    },
-    {
-      "identity" : "swift-protobuf",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
-      "state" : {
-        "revision" : "ab3a58b7209a17d781c0d1dbb3e1ff3da306bae8",
-        "version" : "1.20.3"
-      }
-    }
-  ],
-  "version" : 2
-}

store/fdroid/config.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-repo_url = "https://mobileapp.bitwarden.com/fdroid/repo"
+repo_url = "https://mobileapp.bitwarden.com/fdroid"
 repo_name = "Bitwarden F-Droid Repo"
 repo_icon = "fdroid-icon.png"
 repo_description = """