Adjust datamodels and hub interactions

.gitignore

@@ -43,5 +43,3 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 /android/key.properties
-
-# NEVER STORE ANY KEY OR API KEYS WHEN COMMITING CODE!!

.woodpecker/workflow.yaml

@@ -1,15 +0,0 @@
-when:
-  - event: push
-    branch: dev
-
-steps:
-  - name: build
-    image: instrumentisto/flutter
-    commands:
-      - cd OpenContacts
-      - echo "Starting to build..."
-      - flutter build --debug
-  - name: Deploy
-    image: debian
-    commands:
-      - echo "Hello World"

README.md

@@ -1,15 +1,10 @@
-<img src="https://raw.githubusercontent.com/Mrdabup/OpenContacts/refs/heads/dev/assets/images/logo512.png" width="200"/>
+<img src="https://github.com/Nutcake/ReCon/raw/main/assets/images/logo512.png" width="200"/>
 
-# OpenContacts
+# ReCon
 
-A Resonite Contacts App, based on Nutcake's Recon.
+A Resonite Contacts App
-
-[Get the latest version of OpenContacts here](https://git.mrdab.vore.media/ThatOneJackalGuy/OpenContacts/releases)
-
-[Available on github too!](https://github.com/Mrdabup/OpenContacts/releases)
-
-[Get ReCon here](https://github.com/Nutcake/ReCon)
 
+[Get it here](https://github.com/Nutcake/ReCon/releases/latest)
 
 ## Building
 
@@ -20,7 +15,6 @@ Currently only Android is fully supported.
 The app works on other platforms, though not every feature will be functional.
 For example, notifications are currently not supported on non-android builds.
 
-### Screenshots
+## Screenshots
-TODO: Screenshots!
 
-<!--<img src="https://github.com/Nutcake/ReCon/assets/10452593/a46ccf8a-0a9f-4518-98e6-84fad2d7bf26" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/5d158f58-cd27-4a68-abf3-9068e92b6a82" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/f2ce95ef-e513-46cb-9654-31e74cdc7c09" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/58ef5e5e-1b53-4a47-92f8-bcbcba7a1e86" width=198/>-->
+<img src="https://github.com/Nutcake/ReCon/assets/10452593/a46ccf8a-0a9f-4518-98e6-84fad2d7bf26" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/5d158f58-cd27-4a68-abf3-9068e92b6a82" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/f2ce95ef-e513-46cb-9654-31e74cdc7c09" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/58ef5e5e-1b53-4a47-92f8-bcbcba7a1e86" width=198/>

android/app/build.gradle

@@ -49,7 +49,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "de.tojcklguy.opencontacts"
+        applicationId "me.voidspace.recon"
         minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.tojcklguy.opencontacts">
+    package="de.voidspace.recon">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.tojcklguy.opencontacts">
+    package="de.voidspace.recon">
 
     <!-- Required to fetch data from the internet. -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -7,9 +7,9 @@
     <!-- Optional, you'll have to check this permission by yourself. -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
-        android:label="OpenContacts"
+        android:label="ReCon"
         android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon">
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/app/src/main/kotlin/de/voidspace/recon/MainActivity.kt

@@ -1,6 +1,6 @@
-package de.tojcklguy.opencontacts
+package de.voidspace.recon
 
 import io.flutter.embedding.android.FlutterActivity
 
 class MainActivity: FlutterActivity() {
-}
+}

android/app/src/main/kotlin/me/voidspace/recon/MainActivity.kt

@@ -3,4 +3,4 @@ package me.voidspace.recon
 import io.flutter.embedding.android.FlutterActivity
 
 class MainActivity: FlutterActivity() {
-} 
+}

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.tojcklguy.opencontacts">
+    package="de.voidspace.recon">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

ios/Podfile.lock

@@ -51,9 +51,9 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - FMDB (2.7.9):
+  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.9)
+    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.9)
+  - FMDB/standard (2.7.5)
   - image_picker_ios (0.0.1):
     - Flutter
   - just_audio (0.0.1):
@@ -68,9 +68,9 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
-  - SDWebImage (5.19.0):
+  - SDWebImage (5.13.2):
-    - SDWebImage/Core (= 5.19.0)
+    - SDWebImage/Core (= 5.13.2)
-  - SDWebImage/Core (5.19.0)
+  - SDWebImage/Core (5.13.2)
   - share_plus (0.0.1):
     - Flutter
   - sqflite (0.0.3):
@@ -161,14 +161,14 @@ SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  FMDB: aa44149f6fb634b1ac54f64f47064bb0d0c5a032
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
-  SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
+  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
@@ -177,4 +177,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0a7d5b7d0e53420cb0284f7b2f171f93843b94d2
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -7,15 +7,15 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0C919EFF59BB245CE33C1729 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD8D55317A9F9C1E8BDC309E /* Pods_RunnerTests.framework */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		3EE80C682BA655DB0086A0C6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3DE141E94870D9CA578104 /* Pods_Runner.framework */; };
+		3EACF4502AF94B2E0009EB00 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3BAB80CE2FD566CD74754C6 /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		A04538A4FD002863EA8D7E2E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B83C597EDF1CEFE95FFFB1B /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -31,29 +31,29 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2A38106953F973A4A4D2889C /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		35345364120A3EBED9C200D8 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3D3DE141E94870D9CA578104 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3EACF44C2AF946870009EB00 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		3EACF44D2AF94B1B0009EB00 /* sqflite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = sqflite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4013FCB2867BE8C285FCE973 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		6357E70700B420135CF38106 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
-		73E6CA98A4DD47389AC0DD2C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		8B83C597EDF1CEFE95FFFB1B /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		947052A3147FEB296CDB1CF8 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* recon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = recon.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146EE1CF9000F007C117D /* ReCon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReCon.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		AD8D55317A9F9C1E8BDC309E /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		98689629DBCBD9B9079D4BCB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		CA3447F4857A0510F7FFE6B7 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		9B70C4D26DEBAB78C4541963 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		D99312EB7B07F458E04BFDD3 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		ACF34F80AF1EDFE1E02822A3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		DB366C7024A03BCB71242FB5 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		C3BAB80CE2FD566CD74754C6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -61,7 +61,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0C919EFF59BB245CE33C1729 /* Pods_RunnerTests.framework in Frameworks */,
+				A04538A4FD002863EA8D7E2E /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -69,7 +69,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3EE80C682BA655DB0086A0C6 /* Pods_Runner.framework in Frameworks */,
+				3EACF4502AF94B2E0009EB00 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -110,7 +110,7 @@
 		97C146EF1CF9000F007C117D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				97C146EE1CF9000F007C117D /* recon.app */,
+				97C146EE1CF9000F007C117D /* ReCon.app */,
 				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
@@ -135,12 +135,12 @@
 		EB365C9671FE77D43024480F /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				D99312EB7B07F458E04BFDD3 /* Pods-Runner.debug.xcconfig */,
+				98689629DBCBD9B9079D4BCB /* Pods-Runner.debug.xcconfig */,
-				4013FCB2867BE8C285FCE973 /* Pods-Runner.release.xcconfig */,
+				ACF34F80AF1EDFE1E02822A3 /* Pods-Runner.release.xcconfig */,
-				CA3447F4857A0510F7FFE6B7 /* Pods-Runner.profile.xcconfig */,
+				9B70C4D26DEBAB78C4541963 /* Pods-Runner.profile.xcconfig */,
-				2A38106953F973A4A4D2889C /* Pods-RunnerTests.debug.xcconfig */,
+				35345364120A3EBED9C200D8 /* Pods-RunnerTests.debug.xcconfig */,
-				73E6CA98A4DD47389AC0DD2C /* Pods-RunnerTests.release.xcconfig */,
+				6357E70700B420135CF38106 /* Pods-RunnerTests.release.xcconfig */,
-				DB366C7024A03BCB71242FB5 /* Pods-RunnerTests.profile.xcconfig */,
+				947052A3147FEB296CDB1CF8 /* Pods-RunnerTests.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -149,8 +149,8 @@
 			isa = PBXGroup;
 			children = (
 				3EACF44D2AF94B1B0009EB00 /* sqflite.framework */,
-				3D3DE141E94870D9CA578104 /* Pods_Runner.framework */,
+				C3BAB80CE2FD566CD74754C6 /* Pods_Runner.framework */,
-				AD8D55317A9F9C1E8BDC309E /* Pods_RunnerTests.framework */,
+				8B83C597EDF1CEFE95FFFB1B /* Pods_RunnerTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -162,7 +162,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				690A3B0A6C07C9F2F97916FF /* [CP] Check Pods Manifest.lock */,
+				19ED0D0FE3A6C2191496F46B /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
 				2597599605DD2CD4DB799735 /* Frameworks */,
@@ -181,13 +181,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				8BF7047545265288073F8A43 /* [CP] Check Pods Manifest.lock */,
+				197307D9FE00A90F03801302 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				3E67E7F8ECF942FF5AF50545 /* [CP] Embed Pods Frameworks */,
+				BDF85620D00D0FE7A8BAEF7B /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -195,7 +195,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* recon.app */;
+			productReference = 97C146EE1CF9000F007C117D /* ReCon.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -205,7 +205,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {
@@ -259,62 +259,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		197307D9FE00A90F03801302 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		3E67E7F8ECF942FF5AF50545 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		690A3B0A6C07C9F2F97916FF /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8BF7047545265288073F8A43 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -336,6 +281,44 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		19ED0D0FE3A6C2191496F46B /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -351,6 +334,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		BDF85620D00D0FE7A8BAEF7B /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -405,7 +405,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_HEADERS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -425,7 +424,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -437,7 +435,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -446,13 +443,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = recon;
+				INFOPLIST_KEY_CFBundleDisplayName = ReCon;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSDownloadsFolderUsageDescription = "Downloading assets from your inventory";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Recording voice messages";
-				INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "";
-				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -472,9 +464,9 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = P9AV4LPNLL;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_NAME = 0.11.2;
+				FLUTTER_BUILD_NAME = 0.10.3;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = recon;
+				INFOPLIST_KEY_CFBundleDisplayName = ReCon;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -482,9 +474,9 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.11.2;
+				MARKETING_VERSION = 0.10.3;
-				PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
+				PRODUCT_BUNDLE_IDENTIFIER = me.voidspace.recon;
-				PRODUCT_NAME = recon;
+				PRODUCT_NAME = ReCon;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -493,7 +485,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2A38106953F973A4A4D2889C /* Pods-RunnerTests.debug.xcconfig */;
+			baseConfigurationReference = 35345364120A3EBED9C200D8 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -511,7 +503,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 73E6CA98A4DD47389AC0DD2C /* Pods-RunnerTests.release.xcconfig */;
+			baseConfigurationReference = 6357E70700B420135CF38106 /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -527,7 +519,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = DB366C7024A03BCB71242FB5 /* Pods-RunnerTests.profile.xcconfig */;
+			baseConfigurationReference = 947052A3147FEB296CDB1CF8 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -545,7 +537,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_HEADERS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -565,7 +556,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -577,7 +567,6 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -592,13 +581,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = recon;
+				INFOPLIST_KEY_CFBundleDisplayName = ReCon;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSDownloadsFolderUsageDescription = "Downloading assets from your inventory";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Recording voice messages";
-				INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "";
-				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -611,7 +595,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APPLY_RULES_IN_COPY_HEADERS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -631,7 +614,6 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -643,7 +625,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -652,13 +633,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = recon;
+				INFOPLIST_KEY_CFBundleDisplayName = ReCon;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
-				INFOPLIST_KEY_NSDownloadsFolderUsageDescription = "Downloading assets from your inventory";
-				INFOPLIST_KEY_NSMicrophoneUsageDescription = "Recording voice messages";
-				INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDefault;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "";
-				INFOPLIST_KEY_UIUserInterfaceStyle = Automatic;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -680,9 +656,9 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = P9AV4LPNLL;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_NAME = 0.11.2;
+				FLUTTER_BUILD_NAME = 0.10.3;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = recon;
+				INFOPLIST_KEY_CFBundleDisplayName = ReCon;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -690,9 +666,9 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.11.2;
+				MARKETING_VERSION = 0.10.3;
-				PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
+				PRODUCT_BUNDLE_IDENTIFIER = me.voidspace.recon;
-				PRODUCT_NAME = recon;
+				PRODUCT_NAME = ReCon;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -710,9 +686,9 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = P9AV4LPNLL;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_NAME = 0.11.2;
+				FLUTTER_BUILD_NAME = 0.10.3;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = recon;
+				INFOPLIST_KEY_CFBundleDisplayName = ReCon;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -720,9 +696,9 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.11.2;
+				MARKETING_VERSION = 0.10.3;
-				PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
+				PRODUCT_BUNDLE_IDENTIFIER = me.voidspace.recon;
-				PRODUCT_NAME = recon;
+				PRODUCT_NAME = ReCon;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -765,4 +741,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "recon.app"
+               BuildableName = "ReCon.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "recon.app"
+            BuildableName = "ReCon.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -65,7 +65,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "recon.app"
+            BuildableName = "ReCon.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -82,7 +82,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "recon.app"
+            BuildableName = "ReCon.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -93,7 +93,7 @@
    </AnalyzeAction>
    <ArchiveAction
       buildConfiguration = "Release"
-      customArchiveName = "recon"
+      customArchiveName = "ReCon"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,134 +1,104 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "icon_40x40@2x.png",
+      "filename": "Icon_40x40@2x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "2x",
-      "size" : "20x20"
+      "size": "40x40"
     },
     {
-      "filename" : "icon_60x60@3x.png",
+      "filename": "Icon_58x58@2x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "3x",
+      "scale": "2x",
-      "size" : "20x20"
+      "size": "58x58"
     },
     {
-      "filename" : "icon_58x58@2x.png",
+      "filename": "Icon_60x60@3x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "3x",
-      "size" : "29x29"
+      "size": "60x60"
     },
     {
-      "filename" : "icon_87x87@3x.png",
+      "filename": "Icon_76x76@2x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "3x",
+      "scale": "2x",
-      "size" : "29x29"
+      "size": "76x76"
     },
     {
-      "filename" : "icon_80x80@2x.png",
+      "filename": "Icon_80x80@2x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "2x",
-      "size" : "40x40"
+      "size": "80x80"
     },
     {
-      "filename" : "icon_120x120@3x.png",
+      "filename": "Icon_87x87@3x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "3x",
+      "scale": "3x",
-      "size" : "40x40"
+      "size": "87x87"
     },
     {
-      "filename" : "icon_60x60@2x.png",
+      "filename": "Icon_114x114@3x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "3x",
-      "size" : "60x60"
+      "size": "114x114"
     },
     {
-      "filename" : "icon_180x180@3x.png",
+      "filename": "Icon_120x120@2x.png",
-      "idiom" : "iphone",
+      "idiom": "universal",
-      "scale" : "3x",
+      "scale": "2x",
-      "size" : "60x60"
+      "size": "120x120"
     },
     {
-      "filename" : "icon_40x40@2x 1.png",
+      "filename": "Icon_120x120@3x.png",
-      "idiom" : "ipad",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "3x",
-      "size" : "20x20"
+      "size": "120x120"
     },
     {
-      "filename" : "icon_58x58@2x 1.png",
+      "filename": "Icon_128x128@2x.png",
-      "idiom" : "ipad",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "2x",
-      "size" : "29x29"
+      "size": "128x128"
     },
     {
-      "filename" : "icon_80x80@2x 1.png",
+      "filename": "Icon_136x136@2x.png",
-      "idiom" : "ipad",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "2x",
-      "size" : "40x40"
+      "size": "136x136"
     },
     {
-      "filename" : "icon_76x76@2x.png",
+      "filename": "Icon_152x152@2x.png",
-      "idiom" : "ipad",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "2x",
-      "size" : "76x76"
+      "size": "152x152"
     },
     {
-      "filename" : "icon_83.5x83.5@2x.png",
+      "filename": "Icon_167x167@2x.png",
-      "idiom" : "ipad",
+      "idiom": "universal",
-      "scale" : "2x",
+      "scale": "2x",
-      "size" : "83.5x83.5"
+      "size": "167x167"
     },
     {
-      "filename" : "icon_1024x1024.png",
+      "filename": "Icon_180x180@3x.png",
-      "idiom" : "ios-marketing",
+      "idiom": "universal",
-      "scale" : "1x",
+      "scale": "3x",
-      "size" : "1024x1024"
+      "size": "180x180"
     },
     {
-      "filename" : "icon_114x114@3x.png",
+      "filename": "Icon_192x192@3x.png",
-      "idiom" : "universal",
+      "idiom": "universal",
-      "scale" : "3x",
+      "scale": "3x",
-      "size" : "114x114"
+      "size": "192x192"
     },
     {
-      "filename" : "icon_120x120@2x.png",
+      "filename": "Icon-App-iTunes.png",
-      "idiom" : "universal",
+      "idiom": "ios-marketing",
-      "scale" : "2x",
+      "scale": "1x",
-      "size" : "120x120"
+      "size": "1024x1024"
-    },
-    {
-      "filename" : "icon_128x128@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_136x136@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x",
-      "size" : "136x136"
-    },
-    {
-      "filename" : "icon_152x152@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x",
-      "size" : "152x152"
-    },
-    {
-      "filename" : "icon_167x167@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x",
-      "size" : "167x167"
-    },
-    {
-      "filename" : "icon_192x192@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x",
-      "size" : "192x192"
     }
   ],
-  "info" : {
+  "info": {
-    "author" : "xcode",
+    "author": "me.voidspace",
-    "version" : 1
+    "version": 1
   }
 }

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -16,14 +14,12 @@
                         <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                                <rect key="frame" x="196.33333333333334" y="426" width="0.33333333333334281" height="0.33333333333331439"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
                             <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
@@ -32,10 +28,10 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="80.916030534351137" y="264.08450704225356"/>
+            <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="0.3333333432674408" height="0.3333333432674408"/>
+        <image name="LaunchImage" width="168" height="185"/>
     </resources>
 </document>

ios/Runner/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>recon</string>
+	<string>ReCon</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>recon</string>
+	<string>ReCon</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -32,6 +32,7 @@
 	<array>
 		<string>fetch</string>
 		<string>processing</string>
+		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen.storyboard</string>
@@ -40,13 +41,15 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>

ios/Runner/Runner.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)ch.isota.recon</string>
+		<string>$(AppIdentifierPrefix)me.voidspace.recon</string>
 	</array>
 </dict>
 </plist>

lib/apis/cloud_variable_api.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/cloud_variable.dart';
+import 'package:recon/models/cloud_variable.dart';
 
 class CloudVariableApi {
   static Future<CloudVariable> readCloudVariable(ApiClient client,

lib/apis/contact_api.dart

@@ -1,37 +1,13 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/users/friend.dart';
+import 'package:recon/models/users/contact.dart';
-import 'package:OpenContacts/models/users/friend_status.dart';
-import 'package:OpenContacts/models/users/user.dart';
-import 'package:OpenContacts/models/users/user_profile.dart';
-import 'package:OpenContacts/models/users/user_status.dart';
 
 class ContactApi {
-  static Future<List<Friend>> getFriendsList(ApiClient client, {DateTime? lastStatusUpdate}) async {
+  static Future<List<Contact>> getFriendsList(ApiClient client, {DateTime? lastStatusUpdate}) async {
     final response = await client.get("/users/${client.userId}/contacts${lastStatusUpdate != null ? "?lastStatusUpdate=${lastStatusUpdate.toUtc().toIso8601String()}" : ""}");
     client.checkResponse(response);
     final data = jsonDecode(response.body) as List;
-    return data.map((e) => Friend.fromMap(e)).toList();
+    return data.map((e) => Contact.fromMap(e)).toList();
-  }
-
-  static Future<void> addUserAsFriend(ApiClient client, {required User user}) async {
-    final friend = Friend(
-      id: user.id,
-      username: user.username,
-      ownerId: client.userId,
-      userStatus: UserStatus.empty(),
-      userProfile: UserProfile.empty(),
-      contactStatus: FriendStatus.accepted,
-      latestMessageTime: DateTime.now(),
-    );
-    final body = jsonEncode(friend.toMap(shallow: true));
-    final response = await client.put("/users/${client.userId}/contacts/${user.id}", body: body);
-    client.checkResponse(response);
-  }
-
-  static Future<void> removeUserAsFriend(ApiClient client, {required User user}) async {
-    final response = await client.delete("/users/${client.userId}/friends/${user.id}");
-    client.checkResponse(response);
   }
 }

lib/apis/github_api.dart

@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 class GithubApi {
-  static const baseUrl = "https://git.mrdab.vore.media/api/v1";
+  static const baseUrl = "https://api.github.com";
 
   static Future<String> getLatestTagName() async {
-    final response = await http.get(Uri.parse("$baseUrl/repos/ThatOneJackalGuy/OpenContacts/releases?per_page=1"));
+    final response = await http.get(Uri.parse("$baseUrl/repos/Nutcake/ReCon/releases?per_page=1"));
     if (response.statusCode != 200) return "";
     final body = jsonDecode(response.body) as List;
     if (body.isEmpty) return "";

lib/apis/message_api.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/message.dart';
+import 'package:recon/models/message.dart';
 
 class MessageApi {
   static Future<List<Message>> getUserMessages(ApiClient client, {String userId = "", DateTime? fromTime,

lib/apis/record_api.dart

@@ -3,16 +3,16 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:typed_data';
 import 'package:collection/collection.dart';
-import 'package:OpenContacts/models/records/asset_digest.dart';
+import 'package:recon/models/records/asset_digest.dart';
-import 'package:OpenContacts/models/records/json_template.dart';
+import 'package:recon/models/records/json_template.dart';
 import 'package:http/http.dart' as http;
 import 'package:flutter/material.dart';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/records/asset_upload_data.dart';
+import 'package:recon/models/records/asset_upload_data.dart';
-import 'package:OpenContacts/models/records/resonite_db_asset.dart';
+import 'package:recon/models/records/resonite_db_asset.dart';
-import 'package:OpenContacts/models/records/preprocess_status.dart';
+import 'package:recon/models/records/preprocess_status.dart';
-import 'package:OpenContacts/models/records/record.dart';
+import 'package:recon/models/records/record.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:path/path.dart';
 

lib/apis/session_api.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/session.dart';
+import 'package:recon/models/session.dart';
 
 class SessionApi {
   static Future<Session> getSession(ApiClient client, {required String sessionId}) async {

lib/apis/user_api.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/personal_profile.dart';
+import 'package:recon/models/personal_profile.dart';
-import 'package:OpenContacts/models/users/user.dart';
+import 'package:recon/models/users/user.dart';
-import 'package:OpenContacts/models/users/user_status.dart';
+import 'package:recon/models/users/user_status.dart';
 
 class UserApi {
   static Future<Iterable<User>> searchUsers(ApiClient client, {required String needle}) async {

lib/auxiliary.dart

@@ -1,4 +1,4 @@
-import 'package:OpenContacts/config.dart';
+import 'package:recon/config.dart';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' as p;
 import 'package:html/parser.dart' as htmlparser;

lib/client_holder.dart

@@ -1,8 +1,8 @@
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/clients/notification_client.dart';
+import 'package:recon/clients/notification_client.dart';
-import 'package:OpenContacts/clients/settings_client.dart';
+import 'package:recon/clients/settings_client.dart';
-import 'package:OpenContacts/models/authentication_data.dart';
+import 'package:recon/models/authentication_data.dart';
 import 'package:flutter/material.dart';
 
 class ClientHolder extends InheritedWidget {

lib/clients/api_client.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:http/http.dart' as http;
-import 'package:OpenContacts/models/authentication_data.dart';
+import 'package:recon/models/authentication_data.dart';
 import 'package:logging/logging.dart';
 import 'package:uuid/uuid.dart';
 

lib/clients/audio_cache_client.dart

@@ -4,9 +4,9 @@ import 'package:ffmpeg_kit_flutter_audio/ffmpeg_kit.dart';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/message.dart';
+import 'package:recon/models/message.dart';
 
 class AudioCacheClient {
   final Future<Directory> _directoryFuture = getTemporaryDirectory();

lib/clients/inventory_client.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:OpenContacts/apis/record_api.dart';
+import 'package:recon/apis/record_api.dart';
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/models/inventory/resonite_directory.dart';
+import 'package:recon/models/inventory/resonite_directory.dart';
-import 'package:OpenContacts/models/records/record.dart';
+import 'package:recon/models/records/record.dart';
 
 enum SortMode {
   name,

lib/clients/messaging_client.dart

@@ -1,25 +1,28 @@
 import 'dart:async';
 
+import 'package:recon/apis/contact_api.dart';
+import 'package:recon/apis/message_api.dart';
+import 'package:recon/apis/session_api.dart';
+import 'package:recon/apis/user_api.dart';
+import 'package:recon/clients/api_client.dart';
+import 'package:recon/clients/notification_client.dart';
+import 'package:recon/clients/settings_client.dart';
+import 'package:recon/crypto_helper.dart';
+import 'package:recon/hub_manager.dart';
+import 'package:recon/models/broadcast_group.dart';
+import 'package:recon/models/hub_events.dart';
+import 'package:recon/models/message.dart';
+import 'package:recon/models/session.dart';
+import 'package:recon/models/users/contact.dart';
+import 'package:recon/models/users/contact_status.dart';
+import 'package:recon/models/users/online_status.dart';
+import 'package:recon/models/users/user.dart';
+import 'package:recon/models/users/user_status.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:OpenContacts/apis/contact_api.dart';
-import 'package:OpenContacts/apis/message_api.dart';
-import 'package:OpenContacts/apis/session_api.dart';
-import 'package:OpenContacts/apis/user_api.dart';
-import 'package:OpenContacts/clients/api_client.dart';
-import 'package:OpenContacts/clients/notification_client.dart';
-import 'package:OpenContacts/clients/settings_client.dart';
-import 'package:OpenContacts/crypto_helper.dart';
-import 'package:OpenContacts/hub_manager.dart';
-import 'package:OpenContacts/models/hub_events.dart';
-import 'package:OpenContacts/models/message.dart';
-import 'package:OpenContacts/models/session.dart';
-import 'package:OpenContacts/models/users/friend.dart';
-import 'package:OpenContacts/models/users/online_status.dart';
-import 'package:OpenContacts/models/users/user_status.dart';
 
 class MessagingClient extends ChangeNotifier {
   static const Duration _autoRefreshDuration = Duration(seconds: 10);
@@ -29,7 +32,7 @@ class MessagingClient extends ChangeNotifier {
   static const String _lastUpdateKey = "__last-update-time";
 
   final ApiClient _apiClient;
-  final List<Friend> _sortedFriendsCache = []; // Keep a sorted copy so as to not have to sort during build()
+  final List<Contact> _sortedFriendsCache = []; // Keep a sorted copy so as to not have to sort during build()
   final Map<String, MessageCache> _messageCache = {};
   final Map<String, List<Message>> _unreads = {};
   final Logger _logger = Logger("Messaging");
@@ -38,7 +41,7 @@ class MessagingClient extends ChangeNotifier {
   final Map<String, Session> _sessionMap = {};
   final Set<String> _knownSessionKeys = {};
   final SettingsClient _settingsClient;
-  Friend? selectedFriend;
+  Contact? selectedFriend;
 
   Timer? _statusHeartbeat;
   Timer? _autoRefresh;
@@ -76,16 +79,16 @@ class MessagingClient extends ChangeNotifier {
 
   String? get initStatus => _initStatus;
 
-  List<Friend> get cachedFriends => _sortedFriendsCache;
+  List<Contact> get cachedFriends => _sortedFriendsCache;
 
-  List<Message> getUnreadsForFriend(Friend friend) => _unreads[friend.id] ?? [];
+  List<Message> getUnreadsForContact(Contact contact) => _unreads[contact.id] ?? [];
 
-  bool friendHasUnreads(Friend friend) => _unreads.containsKey(friend.id);
+  bool contactHasUnreads(Contact contact) => _unreads.containsKey(contact.id);
 
   bool messageIsUnread(Message message) =>
       _unreads[message.senderId]?.any((element) => element.id == message.id) ?? false;
 
-  Friend? getAsFriend(String userId) => Friend.fromMapOrNull(Hive.box(_messageBoxKey).get(userId));
+  Contact? getAsContact(String userId) => Contact.fromMapOrNull(Hive.box(_messageBoxKey).get(userId));
 
   MessageCache? getUserMessageCache(String userId) => _messageCache[userId];
 
@@ -107,7 +110,7 @@ class MessagingClient extends ChangeNotifier {
 
     final friends = await ContactApi.getFriendsList(_apiClient, lastStatusUpdate: lastUpdateUtc);
     for (final friend in friends) {
-      await _updateContact(friend);
+      await _updateContactLocal(friend);
     }
 
     _initStatus = "";
@@ -129,7 +132,7 @@ class MessagingClient extends ChangeNotifier {
     clearUnreadsForUser(batch.senderId);
   }
 
-  Future<void> setOnlineStatus(OnlineStatus status) async {
+  Future<void> setOnlineStatus(OnlineStatus status, {String? target}) async {
     final pkginfo = await PackageInfo.fromPlatform();
     final now = DateTime.now();
     _userStatus = _userStatus.copyWith(
@@ -146,15 +149,16 @@ class MessagingClient extends ChangeNotifier {
       arguments: [
         _userStatus.toMap(),
         {
-          "group": 1,
+          "group": target == null ? BroadcastGroup.allContacts.index : BroadcastGroup.specificContacts.index,
-          "targetIds": null,
+          "targetIds": target,
         }
       ],
     );
-
+    if (target == null) {
-    final self = getAsFriend(_apiClient.userId);
+      final self = getAsContact(_apiClient.userId);
-    if (self != null) {
+      if (self != null) {
-      await _updateContact(self.copyWith(userStatus: _userStatus));
+        await _updateContactLocal(self.copyWith(userStatus: _userStatus));
+      }
     }
     notifyListeners();
   }
@@ -169,7 +173,10 @@ class MessagingClient extends ChangeNotifier {
     }
     messages.sort();
     _sortFriendsCache();
-    _notificationClient.showUnreadMessagesNotification(messages.reversed);
+    _notificationClient.showUnreadMessagesNotification(
+      messages.reversed,
+      getAsContact,
+    );
     notifyListeners();
   }
 
@@ -204,10 +211,10 @@ class MessagingClient extends ChangeNotifier {
   }
 
   Future<void> updateFriendStatus(String userId) async {
-    final friend = getAsFriend(userId);
+    final friend = getAsContact(userId);
     if (friend == null) return;
     final newStatus = await UserApi.getUserStatus(_apiClient, userId: userId);
-    await _updateContact(friend.copyWith(userStatus: newStatus));
+    await _updateContactLocal(friend.copyWith(userStatus: newStatus));
     notifyListeners();
   }
 
@@ -216,6 +223,30 @@ class MessagingClient extends ChangeNotifier {
     notifyListeners();
   }
 
+  void addUserAsFriend(User user) {
+    _hubManager.send(
+      "UpdateContact",
+      arguments: [
+        user.asContactRequest(
+          ownerId: _apiClient.userId,
+          contactStatus: ContactStatus.accepted,
+        )
+      ],
+    );
+  }
+
+  void removeUserAsFriend(User user) {
+    _hubManager.send(
+      "UpdateContact",
+      arguments: [
+        user.asContactRequest(
+          ownerId: _apiClient.userId,
+          contactStatus: ContactStatus.ignored,
+        )
+      ],
+    );
+  }
+
   Future<void> _refreshUnreads() async {
     try {
       final unreadMessages = await MessageApi.getUserMessages(_apiClient, unreadOnly: true);
@@ -223,50 +254,22 @@ class MessagingClient extends ChangeNotifier {
     } catch (_) {}
   }
 
-  // Calculate online status value, with 'headless' between 'busy' and 'offline'
-  double getOnlineStatusValue(Friend friend) {
-    // Adjusting values to ensure correct placement of 'headless'
-    if (friend.isHeadless) return 2.5;
-    switch (friend.userStatus.onlineStatus) {
-      case OnlineStatus.sociable:
-        return 0;
-      case OnlineStatus.online:
-        return 1;
-      case OnlineStatus.away:
-        return 2;
-      case OnlineStatus.busy:
-        return 3;
-      case OnlineStatus.invisible:
-        return 3.5;
-      case OnlineStatus.offline:
-      default:
-        return 4;
-    }
-  }
-
   void _sortFriendsCache() {
     _sortedFriendsCache.sort((a, b) {
-      // Check for unreads and sort by latest message time if either has unreads
+      if (a.isContactRequest != b.isContactRequest) {
-      bool aHasUnreads = friendHasUnreads(a);
+        return a.isContactRequest ? -1 : 1;
-      bool bHasUnreads = friendHasUnreads(b);
-      if (aHasUnreads || bHasUnreads) {
-        if (aHasUnreads && bHasUnreads) {
-          return -a.latestMessageTime.compareTo(b.latestMessageTime);
-        }
-
-        return aHasUnreads ? -1 : 1;
       }
 
-      int onlineStatusComparison = getOnlineStatusValue(a).compareTo(getOnlineStatusValue(b));
+      var aVal = contactHasUnreads(a) ? -3 : 0;
-      if (onlineStatusComparison != 0) {
+      var bVal = contactHasUnreads(b) ? -3 : 0;
-        return onlineStatusComparison;
-      }
 
-      return -a.latestMessageTime.compareTo(b.latestMessageTime);
+      aVal -= a.latestMessageTime.compareTo(b.latestMessageTime);
+      aVal += a.userStatus.onlineStatus.compareTo(b.userStatus.onlineStatus) * 2;
+      return aVal.compareTo(bVal);
     });
   }
 
-  Future<void> _updateContact(Friend friend) async {
+  Future<void> _updateContactLocal(Contact friend) async {
     final box = Hive.box(_messageBoxKey);
     box.put(friend.id, friend.toMap());
     final lastStatusUpdate = box.get(_lastUpdateKey);
@@ -298,15 +301,16 @@ class MessagingClient extends ChangeNotifier {
     _hubManager.setHandler(EventTarget.receiveStatusUpdate, _onReceiveStatusUpdate);
     _hubManager.setHandler(EventTarget.receiveSessionUpdate, _onReceiveSessionUpdate);
     _hubManager.setHandler(EventTarget.removeSession, _onRemoveSession);
+    _hubManager.setHandler(EventTarget.contactAddedOrUpdated, _onContactAddedOrUpdated);
 
     await _hubManager.start();
     _hubManager.send(
       "InitializeStatus",
       responseHandler: (Map data) async {
         final rawContacts = data["contacts"] as List;
-        final contacts = rawContacts.map((e) => Friend.fromMap(e)).toList();
+        final contacts = rawContacts.map((e) => Contact.fromMap(e)).toList();
         for (final contact in contacts) {
-          await _updateContact(contact);
+          await _updateContactLocal(contact);
         }
         _initStatus = "";
         notifyListeners();
@@ -327,6 +331,51 @@ class MessagingClient extends ChangeNotifier {
     return _sessionMap.map((key, value) => MapEntry(CryptoHelper.idHash(value.id + salt), value));
   }
 
+  void _onContactAddedOrUpdated(List args) {
+    bool shouldUpdateRequestCount = false;
+    bool shouldRegisterNewContact = false;
+    for (var request in args) {
+      final newContact = Contact.fromMap(request);
+      Contact? existingContact = getAsContact(newContact.id);
+      if (existingContact != null) {
+        if (!existingContact.isAccepted && newContact.isAccepted) {
+          shouldRegisterNewContact = true;
+        }
+        if (newContact.isContactRequest != existingContact.isContactRequest) {
+          shouldUpdateRequestCount = true;
+        }
+      } else {
+        if (newContact.isAccepted) {
+          shouldRegisterNewContact = true;
+        }
+        if (newContact.isContactRequest) {
+          shouldUpdateRequestCount = true;
+        }
+      }
+      _updateContactLocal(newContact);
+      if (shouldRegisterNewContact) {
+        final isInvisible = userStatus.onlineStatus == OnlineStatus.invisible;
+        _hubManager.send("ListenOnContact", arguments: [newContact.id]);
+        _hubManager.send("RequestStatus", arguments: [newContact.id, isInvisible]);
+        if (!isInvisible) {
+          _hubManager.send(
+            "BroadcastStatus",
+            arguments: [
+              userStatus.toMap(shallow: true),
+              {
+                "group": BroadcastGroup.specificContacts.index,
+                "targetIds": newContact.id,
+              },
+            ],
+          );
+        }
+      }
+      if (shouldUpdateRequestCount) {
+        _notificationClient.showContactRequestNotification(newContact);
+      }
+    }
+  }
+
   void _onMessageSent(List args) {
     final msg = args[0];
     final message = Message.fromMap(msg, withState: MessageState.sent);
@@ -369,9 +418,9 @@ class MessagingClient extends ChangeNotifier {
         decodedSessions: status.sessions
             .map((e) => sessionMap[e.sessionHash] ?? Session.none().copyWith(accessLevel: e.accessLevel))
             .toList());
-    final friend = getAsFriend(statusUpdate["userId"])?.copyWith(userStatus: status);
+    final friend = getAsContact(statusUpdate["userId"])?.copyWith(userStatus: status);
     if (friend != null) {
-      _updateContact(friend);
+      _updateContactLocal(friend);
     }
     for (var session in status.sessions) {
       if (session.broadcastKey != null && _knownSessionKeys.add(session.broadcastKey ?? "")) {

lib/clients/notification_client.dart

@@ -2,9 +2,10 @@ import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart' as fln;
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
-import 'package:OpenContacts/models/message.dart';
+import 'package:recon/models/message.dart';
-import 'package:OpenContacts/models/session.dart';
+import 'package:recon/models/session.dart';
+import 'package:recon/models/users/contact.dart';
 
 class NotificationChannel {
   final String id;
@@ -26,16 +27,16 @@ class NotificationClient {
       android: fln.AndroidInitializationSettings("ic_notification"),
       iOS: fln.DarwinInitializationSettings(),
       macOS: fln.DarwinInitializationSettings(),
-      linux: fln.LinuxInitializationSettings(defaultActionName: "Open OpenContacts"),
+      linux: fln.LinuxInitializationSettings(defaultActionName: "Open ReCon"),
     ));
 
-  Future<void> showUnreadMessagesNotification(Iterable<Message> messages) async {
+  Future<void> showUnreadMessagesNotification(Iterable<Message> messages, Contact? Function(String userId) contactGetter) async {
     if (messages.isEmpty) return;
 
     final bySender = groupBy(messages, (p0) => p0.senderId);
-
     for (final entry in bySender.entries) {
-      final uname = entry.key.stripUid();
+      final contact = contactGetter(entry.key);
+      final uname = contact?.contactUsername ?? "Unknown";
       await _notifier.show(
         uname.hashCode,
         null,
@@ -93,4 +94,13 @@ class NotificationClient {
       );
     }
   }
+
+  Future<void> showContactRequestNotification(Contact contact) async {
+    await _notifier.show(
+      contact.contactUsername.hashCode,
+      "New Contact request",
+      "User ${contact.contactUsername} wants to be your friend.",
+      null
+    );
+  }
 }

lib/clients/session_client.dart

@@ -1,8 +1,8 @@
 import 'package:collection/collection.dart';
-import 'package:OpenContacts/apis/session_api.dart';
+import 'package:recon/apis/session_api.dart';
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/clients/settings_client.dart';
+import 'package:recon/clients/settings_client.dart';
-import 'package:OpenContacts/models/session.dart';
+import 'package:recon/models/session.dart';
 import 'package:flutter/foundation.dart';
 
 class SessionClient extends ChangeNotifier {

lib/clients/settings_client.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/models/settings.dart';
+import 'package:recon/models/settings.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
 

lib/hub_manager.dart

@@ -3,8 +3,8 @@ import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:OpenContacts/config.dart';
+import 'package:recon/config.dart';
-import 'package:OpenContacts/models/hub_events.dart';
+import 'package:recon/models/hub_events.dart';
 import 'package:logging/logging.dart';
 import 'package:uuid/uuid.dart';
 
@@ -105,12 +105,13 @@ class HubManager {
   }
 
   void _handleInvocation(body) async {
+    _logger.info(body);
     final target = EventTarget.parse(body["target"]);
     final args = body["arguments"] ?? [];
     final handler = _handlers[target];
     if (handler == null) {
       _logger.warning("Unhandled event received");
-      if (kDebugMode) _logger.warning("Invocation target: ${target.name}, args:\n$args");
+      if (kDebugMode) _logger.warning("Invocation target: ${body["target"]}, args:\n$args");
       return;
     }
     handler(args);
@@ -132,6 +133,9 @@ class HubManager {
   }
 
   void dispose() {
+    _handlers.clear();
+    _responseHandlers.clear();
     _wsChannel?.close();
+    _wsChannel = null;
   }
 }

lib/lifecycle_event_handler.dart

@@ -0,0 +1,29 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+class LifecycleEventHandler extends WidgetsBindingObserver {
+  final AsyncCallback? resumeCallBack;
+  final AsyncCallback? suspendingCallBack;
+
+  LifecycleEventHandler({
+    this.resumeCallBack,
+    this.suspendingCallBack,
+  });
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) async {
+    super.didChangeAppLifecycleState(state);
+    switch (state) {
+      case AppLifecycleState.resumed:
+        await resumeCallBack?.call();
+        break;
+      case AppLifecycleState.inactive:
+      case AppLifecycleState.paused:
+      case AppLifecycleState.detached:
+        await suspendingCallBack?.call();
+        break;
+      default:
+        break;
+    }
+  }
+}

lib/main.dart

@@ -13,17 +13,17 @@ import 'package:intl/intl.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
-import 'package:OpenContacts/apis/github_api.dart';
+import 'package:recon/apis/github_api.dart';
-import 'package:OpenContacts/client_holder.dart';
+import 'package:recon/client_holder.dart';
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/clients/inventory_client.dart';
+import 'package:recon/clients/inventory_client.dart';
-import 'package:OpenContacts/clients/messaging_client.dart';
+import 'package:recon/clients/messaging_client.dart';
-import 'package:OpenContacts/clients/session_client.dart';
+import 'package:recon/clients/session_client.dart';
-import 'package:OpenContacts/clients/settings_client.dart';
+import 'package:recon/clients/settings_client.dart';
-import 'package:OpenContacts/models/sem_ver.dart';
+import 'package:recon/models/sem_ver.dart';
-import 'package:OpenContacts/widgets/homepage.dart';
+import 'package:recon/widgets/homepage.dart';
-import 'package:OpenContacts/widgets/login_screen.dart';
+import 'package:recon/widgets/login_screen.dart';
-import 'package:OpenContacts/widgets/update_notifier.dart';
+import 'package:recon/widgets/update_notifier.dart';
 
 import 'models/authentication_data.dart';
 
@@ -59,20 +59,20 @@ void main() async {
     // Ignore
   }
 
-  runApp(recon(settingsClient: settingsClient, cachedAuthentication: cachedAuth));
+  runApp(ReCon(settingsClient: settingsClient, cachedAuthentication: cachedAuth));
 }
 
-class recon extends StatefulWidget {
+class ReCon extends StatefulWidget {
-  const recon({required this.settingsClient, required this.cachedAuthentication, super.key});
+  const ReCon({required this.settingsClient, required this.cachedAuthentication, super.key});
 
   final SettingsClient settingsClient;
   final AuthenticationData cachedAuthentication;
 
   @override
-  State<recon> createState() => _reconState();
+  State<ReCon> createState() => _ReConState();
 }
 
-class _reconState extends State<recon> {
+class _ReConState extends State<ReCon> {
   final Typography _typography = Typography.material2021(platform: defaultTargetPlatform);
   final ReceivePort _port = ReceivePort();
   late AuthenticationData _authData = widget.cachedAuthentication;
@@ -164,8 +164,8 @@ class _reconState extends State<recon> {
           },
           child: DynamicColorBuilder(
             builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) => MaterialApp(
-              debugShowCheckedModeBanner: true,
+              debugShowCheckedModeBanner: false,
-              title: 'OpenContacts',
+              title: 'ReCon',
               theme: ThemeData(
                 useMaterial3: true,
                 textTheme: _typography.black,

lib/models/broadcast_group.dart

@@ -0,0 +1,8 @@
+enum BroadcastGroup
+{
+  public,
+  allContacts,
+  specificContacts,
+  broadcastKey,
+  connectionIds,
+}

lib/models/cloud_variable.dart

@@ -1,4 +1,4 @@
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
 
 class CloudVariable {
   final String ownerId;

lib/models/hub_events.dart

@@ -16,7 +16,9 @@ enum EventTarget {
   messagesRead,
   receiveSessionUpdate,
   removeSession,
-  receiveStatusUpdate;
+  receiveStatusUpdate,
+  sendStatusToUser,
+  contactAddedOrUpdated;
 
   factory EventTarget.parse(String? text) {
     if (text == null) return EventTarget.unknown;

lib/models/inventory/resonite_directory.dart

@@ -1,5 +1,5 @@
 import 'package:collection/collection.dart';
-import 'package:OpenContacts/models/records/record.dart';
+import 'package:recon/models/records/record.dart';
 
 class ResoniteDirectory {
   static const rootName = "Inventory";

lib/models/message.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:OpenContacts/clients/api_client.dart';
+import 'package:recon/clients/api_client.dart';
-import 'package:OpenContacts/apis/message_api.dart';
+import 'package:recon/apis/message_api.dart';
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
-import 'package:OpenContacts/string_formatter.dart';
+import 'package:recon/string_formatter.dart';
 import 'package:uuid/uuid.dart';
 
 enum MessageType {

lib/models/personal_profile.dart

@@ -1,6 +1,6 @@
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
-import 'package:OpenContacts/models/users/entitlement.dart';
+import 'package:recon/models/users/entitlement.dart';
-import 'package:OpenContacts/models/users/user_profile.dart';
+import 'package:recon/models/users/user_profile.dart';
 
 class PersonalProfile {
   final String id;

lib/models/records/asset_diff.dart

@@ -1,5 +1,5 @@
 
-import 'package:OpenContacts/models/records/resonite_db_asset.dart';
+import 'package:recon/models/records/resonite_db_asset.dart';
 
 class AssetDiff extends ResoniteDBAsset{
   final Diff state;

lib/models/records/asset_digest.dart

@@ -1,7 +1,7 @@
 
 import 'dart:typed_data';
 
-import 'package:OpenContacts/models/records/resonite_db_asset.dart';
+import 'package:recon/models/records/resonite_db_asset.dart';
 import 'package:path/path.dart';
 
 class AssetDigest {

lib/models/records/preprocess_status.dart

@@ -1,4 +1,4 @@
-import 'package:OpenContacts/models/records/asset_diff.dart';
+import 'package:recon/models/records/asset_diff.dart';
 
 enum RecordPreprocessState
 {

lib/models/records/record.dart

@@ -1,8 +1,8 @@
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
-import 'package:OpenContacts/models/message.dart';
+import 'package:recon/models/message.dart';
-import 'package:OpenContacts/models/records/asset_digest.dart';
+import 'package:recon/models/records/asset_digest.dart';
-import 'package:OpenContacts/models/records/resonite_db_asset.dart';
+import 'package:recon/models/records/resonite_db_asset.dart';
-import 'package:OpenContacts/string_formatter.dart';
+import 'package:recon/string_formatter.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 

lib/models/session.dart

@@ -1,4 +1,4 @@
-import 'package:OpenContacts/string_formatter.dart';
+import 'package:recon/string_formatter.dart';
 
 class Session {
   final String id;
@@ -131,7 +131,6 @@ class Session {
 enum SessionAccessLevel {
   unknown,
   private,
-  lan,
   contacts,
   contactsPlus,
   registeredUsers,
@@ -140,7 +139,6 @@ enum SessionAccessLevel {
   static const _readableNamesMap = {
     SessionAccessLevel.unknown: "Unknown",
     SessionAccessLevel.private: "Private",
-    SessionAccessLevel.lan: "LAN",
     SessionAccessLevel.contacts: "Contacts only",
     SessionAccessLevel.contactsPlus: "Contacts+",
     SessionAccessLevel.registeredUsers: "Registered users",

lib/models/session_metadata.dart

@@ -1,4 +1,4 @@
-import 'package:OpenContacts/models/session.dart';
+import 'package:recon/models/session.dart';
 import 'package:intl/intl.dart';
 
 class SessionMetadata {

lib/models/settings.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:OpenContacts/models/sem_ver.dart';
+import 'package:recon/models/sem_ver.dart';
-import 'package:OpenContacts/models/users/online_status.dart';
+import 'package:recon/models/users/online_status.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
 

lib/models/users/contact.dart

@@ -0,0 +1,106 @@
+import 'package:recon/auxiliary.dart';
+import 'package:recon/models/users/user_profile.dart';
+import 'package:recon/models/users/contact_status.dart';
+import 'package:recon/models/users/online_status.dart';
+import 'package:recon/models/users/user_status.dart';
+
+class Contact implements Comparable {
+  static const _emptyId = "-1";
+  static const _resoniteBotId = "U-Resonite";
+  final String id;
+  final String contactUsername;
+  final String ownerId;
+  final bool isAccepted;
+  final bool isMigrated;
+  final bool isCounterpartMigrated;
+  final UserStatus userStatus;
+  final UserProfile userProfile;
+  final ContactStatus contactStatus;
+  final DateTime latestMessageTime;
+
+  const Contact({required this.id, required this.contactUsername, required this.ownerId, required this.isAccepted,
+    required this.isMigrated, required this.isCounterpartMigrated, required this.userStatus, required this.userProfile,
+    required this.contactStatus, required this.latestMessageTime,
+  });
+
+  bool get isHeadless => userStatus.outputDevice == "Headless";
+
+  factory Contact.fromMap(Map map) {
+    var userStatus = map["userStatus"] == null ? UserStatus.empty() : UserStatus.fromMap(map["userStatus"]);
+    return Contact(
+      id: map["id"],
+      contactUsername: map["contactUsername"],
+      ownerId: map["ownerId"] ?? map["id"],
+      isAccepted: map["isAccepted"] ?? false,
+      isMigrated: map["isMigrated"] ?? false,
+      isCounterpartMigrated: map["isCounterpartMigrated"] ?? false,
+      // Resonite bot status is always offline but should be displayed as online
+      userStatus:  map["id"] == _resoniteBotId ? userStatus.copyWith(onlineStatus: OnlineStatus.online) : userStatus,
+      userProfile: UserProfile.fromMap(map["profile"] ?? {}),
+      contactStatus: ContactStatus.fromString(map["contactStatus"]),
+      latestMessageTime: map["latestMessageTime"] == null
+          ? DateTime.fromMillisecondsSinceEpoch(0) : DateTime.parse(map["latestMessageTime"]),
+    );
+  }
+
+  static Contact? fromMapOrNull(Map? map) {
+    if (map == null) return null;
+    return Contact.fromMap(map);
+  }
+
+  factory Contact.empty() {
+    return Contact(
+        id: _emptyId,
+        contactUsername: "",
+        ownerId: "",
+        isAccepted: false,
+        isMigrated: false,
+        isCounterpartMigrated: false,
+        userStatus: UserStatus.empty(),
+        userProfile: UserProfile.empty(),
+        contactStatus: ContactStatus.none,
+        latestMessageTime: DateTimeX.epoch
+    );
+  }
+
+  bool get isEmpty => id == _emptyId;
+  bool get isPartiallyMigrated => isMigrated && !isCounterpartMigrated;
+  bool get isContactRequest => !isPartiallyMigrated && isAccepted && contactStatus == ContactStatus.requested;
+
+  Contact copyWith({
+    String? id, String? contactUsername, String? ownerId, UserStatus? userStatus, bool? isAccepted, bool? isMigrated,
+    bool? isCounterpartMigrated, UserProfile? userProfile, ContactStatus? contactStatus, DateTime? latestMessageTime}) {
+    return Contact(
+      id: id ?? this.id,
+      contactUsername: contactUsername ?? this.contactUsername,
+      ownerId: ownerId ?? this.ownerId,
+      isAccepted: isAccepted ?? this.isAccepted,
+      isMigrated: isMigrated ?? this.isMigrated,
+      isCounterpartMigrated: isCounterpartMigrated ?? this.isCounterpartMigrated,
+      userStatus: userStatus ?? this.userStatus,
+      userProfile: userProfile ?? this.userProfile,
+      contactStatus: contactStatus ?? this.contactStatus,
+      latestMessageTime: latestMessageTime ?? this.latestMessageTime,
+    );
+  }
+
+  Map toMap({bool shallow=false}) {
+    return {
+      "id": id,
+      "contactUsername": contactUsername,
+      "ownerId": ownerId,
+      "isAccepted": isAccepted,
+      "isMigrated": isMigrated,
+      "isCounterpartMigrated": isCounterpartMigrated,
+      "userStatus": userStatus.toMap(shallow: shallow),
+      "profile": userProfile.toMap(),
+      "contactStatus": contactStatus.name,
+      "latestMessageTime": latestMessageTime.toIso8601String(),
+    };
+  }
+
+  @override
+  int compareTo(covariant Contact other) {
+    return contactUsername.compareTo(other.contactUsername);
+  }
+}

lib/models/users/contact_status.dart

@@ -0,0 +1,14 @@
+enum ContactStatus {
+  none,
+  searchResult,
+  requested,
+  ignored,
+  blocked,
+  accepted;
+
+  factory ContactStatus.fromString(String text) {
+    return ContactStatus.values.firstWhere((element) => element.name.toLowerCase() == text.toLowerCase(),
+      orElse: () => ContactStatus.none,
+    );
+  }
+}

lib/models/users/entitlement.dart

@@ -1,4 +1,4 @@
-import 'package:OpenContacts/auxiliary.dart';
+import 'package:recon/auxiliary.dart';
 
 class Entitlement {
   Entitlement();

lib/models/users/friend.dart

@@ -1,109 +0,0 @@
-import 'package:OpenContacts/auxiliary.dart';
-import 'package:OpenContacts/models/users/friend_status.dart';
-import 'package:OpenContacts/models/users/online_status.dart';
-import 'package:OpenContacts/models/users/user_profile.dart';
-import 'package:OpenContacts/models/users/user_status.dart';
-
-class Friend implements Comparable {
-  static const _emptyId = "-1";
-  static const _resoniteBotId = "U-Resonite";
-  final String id;
-  final String username;
-  final String ownerId;
-  final UserStatus userStatus;
-  final UserProfile userProfile;
-  final FriendStatus contactStatus;
-  final DateTime latestMessageTime;
-
-  const Friend({
-    required this.id,
-    required this.username,
-    required this.ownerId,
-    required this.userStatus,
-    required this.userProfile,
-    required this.contactStatus,
-    required this.latestMessageTime,
-  });
-
-  bool get isHeadless => userStatus.sessionType == UserSessionType.headless;
-
-  bool get isBot => userStatus.sessionType == UserSessionType.bot || id == _resoniteBotId;
-
-  bool get isOffline =>
-      (userStatus.onlineStatus == OnlineStatus.offline || userStatus.onlineStatus == OnlineStatus.invisible) &&
-      !isBot &&
-      !isHeadless;
-
-  bool get isOnline => !isOffline;
-
-  factory Friend.fromMap(Map map) {
-    var userStatus = map["userStatus"] == null ? UserStatus.empty() : UserStatus.fromMap(map["userStatus"]);
-    return Friend(
-      id: map["id"],
-      username: map["contactUsername"],
-      ownerId: map["ownerId"] ?? map["id"],
-      // Resonite bot status is always offline but should be displayed as online
-      userStatus: map["id"] == _resoniteBotId ? userStatus.copyWith(onlineStatus: OnlineStatus.online) : userStatus,
-      userProfile: UserProfile.fromMap(map["profile"] ?? {}),
-      contactStatus: FriendStatus.fromString(map["contactStatus"]),
-      latestMessageTime: map["latestMessageTime"] == null
-          ? DateTime.fromMillisecondsSinceEpoch(0)
-          : DateTime.parse(map["latestMessageTime"]),
-    );
-  }
-
-  static Friend? fromMapOrNull(Map? map) {
-    if (map == null) return null;
-    return Friend.fromMap(map);
-  }
-
-  factory Friend.empty() {
-    return Friend(
-      id: _emptyId,
-      username: "",
-      ownerId: "",
-      userStatus: UserStatus.empty(),
-      userProfile: UserProfile.empty(),
-      contactStatus: FriendStatus.none,
-      latestMessageTime: DateTimeX.epoch,
-    );
-  }
-
-  bool get isEmpty => id == _emptyId;
-
-  Friend copyWith(
-      {String? id,
-      String? username,
-      String? ownerId,
-      UserStatus? userStatus,
-      UserProfile? userProfile,
-      FriendStatus? contactStatus,
-      DateTime? latestMessageTime}) {
-    return Friend(
-      id: id ?? this.id,
-      username: username ?? this.username,
-      ownerId: ownerId ?? this.ownerId,
-      userStatus: userStatus ?? this.userStatus,
-      userProfile: userProfile ?? this.userProfile,
-      contactStatus: contactStatus ?? this.contactStatus,
-      latestMessageTime: latestMessageTime ?? this.latestMessageTime,
-    );
-  }
-
-  Map toMap({bool shallow = false}) {
-    return {
-      "id": id,
-      "contactUsername": username,
-      "ownerId": ownerId,
-      "userStatus": userStatus.toMap(shallow: shallow),
-      "profile": userProfile.toMap(),
-      "contactStatus": contactStatus.name,
-      "latestMessageTime": latestMessageTime.toIso8601String(),
-    };
-  }
-
-  @override
-  int compareTo(covariant Friend other) {
-    return username.compareTo(other.username);
-  }
-}

lib/models/users/friend_status.dart

@@ -1,14 +0,0 @@
-enum FriendStatus {
-  none,
-  searchResult,
-  requested,
-  ignored,
-  blocked,
-  accepted;
-
-  factory FriendStatus.fromString(String text) {
-    return FriendStatus.values.firstWhere((element) => element.name.toLowerCase() == text.toLowerCase(),
-      orElse: () => FriendStatus.none,
-    );
-  }
-}

lib/models/users/online_status.dart

@@ -5,33 +5,26 @@ enum OnlineStatus {
   invisible,
   away,
   busy,
-  online,
+  online;
-  sociable;
 
   static final List<Color> _colors = [
     Colors.transparent,
-    Colors.grey,
+    Colors.transparent,
     Colors.yellow,
     Colors.red,
     Colors.green,
-    Colors.blue,
   ];
 
-  Color color(BuildContext context) => this == OnlineStatus.offline || this == OnlineStatus.invisible
+  Color color(BuildContext context) => this == OnlineStatus.offline || this == OnlineStatus.invisible ? Theme.of(context).colorScheme.onSurface : _colors[index];
-      ? Theme.of(context).colorScheme.onSecondaryContainer.withAlpha(150)
-      : _colors[index];
 
   factory OnlineStatus.fromString(String? text) {
-    return OnlineStatus.values.firstWhere(
+    return OnlineStatus.values.firstWhere((element) => element.name.toLowerCase() == text?.toLowerCase(),
-      (element) => element.name.toLowerCase() == text?.toLowerCase(),
       orElse: () => OnlineStatus.online,
     );
   }
 
   int compareTo(OnlineStatus other) {
     if (this == other) return 0;
-    if (this == OnlineStatus.sociable) return -1;
-    if (other == OnlineStatus.sociable) return 1;
     if (this == OnlineStatus.online) return -1;
     if (other == OnlineStatus.online) return 1;
     if (this == OnlineStatus.away) return -1;

lib/models/users/user.dart

@@ -1,4 +1,5 @@
-import 'package:OpenContacts/models/users/user_profile.dart';
+import 'package:recon/models/users/contact_status.dart';
+import 'package:recon/models/users/user_profile.dart';
 
 class User {
   final String id;
@@ -31,4 +32,13 @@ class User {
       "profile": userProfile?.toMap(),
     };
   }
+
+  Map asContactRequest({required String ownerId, required ContactStatus contactStatus}) {
+    return {
+      "ownerId": ownerId,
+      "id": id,
+      "contactUsername": username,
+      "contactStatus": ContactStatus.accepted.name,
+    };
+  }
 }