From 5af0f91a6042d08ed519feda6d41a85656859804 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 14 Sep 2026 13:15:52 -0400 Subject: [PATCH 1/4] making conflict 2 --- Neuro App/AppDelegate.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Neuro App/AppDelegate.swift b/Neuro App/AppDelegate.swift index 0cf3a23..87a879a 100644 --- a/Neuro App/AppDelegate.swift +++ b/Neuro App/AppDelegate.swift @@ -100,7 +100,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - AVCaptureDevice.requestAccess(for: .video) { granted in + + + AVCaptureDevice.requestAccess(for: .audio) { granted in if granted { // Access granted } else { @@ -108,7 +110,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - AVCaptureDevice.requestAccess(for: .audio) { granted in + AVCaptureDevice.requestAccess(for: .video) { granted in if granted { // Access granted } else { @@ -116,8 +118,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - - registerForVoIPPushes() return true From 5d9af1524206879a0e5341e37590ccde6ad8563c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 14 Sep 2026 17:13:59 +0000 Subject: [PATCH 2/4] Apply SwiftLint autocorrect fixes --- Neuro App/AppDelegate.swift | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Neuro App/AppDelegate.swift b/Neuro App/AppDelegate.swift index 1e0cab8..0cf3a23 100644 --- a/Neuro App/AppDelegate.swift +++ b/Neuro App/AppDelegate.swift @@ -75,17 +75,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - - - - let configuration = CXProviderConfiguration(localizedName: "Neuro App") configuration.supportsVideo = true // Enable if your app supports video calls configuration.ringtoneSound = "Ringtone.caf" // Provide your custom ringtone sound if needed - - provider = CXProvider(configuration: configuration) provider.setDelegate(self, queue: nil) From 30716269567b31384fabee8db4f19fe1b19f7d50 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 14 Sep 2026 13:15:52 -0400 Subject: [PATCH 3/4] making conflict 2 --- Neuro App/AppDelegate.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Neuro App/AppDelegate.swift b/Neuro App/AppDelegate.swift index 0cf3a23..87a879a 100644 --- a/Neuro App/AppDelegate.swift +++ b/Neuro App/AppDelegate.swift @@ -100,7 +100,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - AVCaptureDevice.requestAccess(for: .video) { granted in + + + AVCaptureDevice.requestAccess(for: .audio) { granted in if granted { // Access granted } else { @@ -108,7 +110,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - AVCaptureDevice.requestAccess(for: .audio) { granted in + AVCaptureDevice.requestAccess(for: .video) { granted in if granted { // Access granted } else { @@ -116,8 +118,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - - registerForVoIPPushes() return true From 9269da5806551711d054f10dbe249d5f92a7cfde Mon Sep 17 00:00:00 2001 From: David Date: Mon, 14 Sep 2026 13:19:35 -0400 Subject: [PATCH 4/4] fix --- .DS_Store | Bin 10244 -> 12292 bytes Neuro App/.DS_Store | Bin 6148 -> 10244 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index af50523389380f29b2069b2a020a6f3d1a26758d..bcf7c911a4fd3e69192e386c552b691b11678bee 100644 GIT binary patch literal 12292 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 E0N@`XhyVZp diff --git a/Neuro App/.DS_Store b/Neuro App/.DS_Store index 725ab13d80edbe859412435834d768627d45e3ea..0438e2c32de862a6b857d9b81922b268cf354618 100644 GIT binary patch literal 10244 zcmeHNYitx%6h3EKV1|x#T6x2|D+|~Fg)NFAAZ+RKsI*YsmhKj`?(Pij$m~qrncV{M zQDP*TV0@dHn4pOM#78u03GIe7#cAs6Nn&4@sl0?D-IAFt4*aI0zjhgK% zdxOAaplUEPuLD4HQki+SIh)pLM_2dAT91h6gfZmhQt5DE=I^ja@ zbigQ=e(y8jGccL~R=Zb2Bh~FTXl3<#QDgKp#4}d5&jm{h7F`9xE;OYLD-BQ)Pxl$R z?L;DHP^hS!FmaM7O|Ft}3UnrtUGmO^p0UihzEA5`s_kB@znO+@Ijx{;{hb-h$Y)Kv zTdB#Uj7;80Ia;G(u*syWwlg`)Fxo6zcXZ24CLC>#Gi0djR-((ca!!+LtXom?wsyZp zw)BD)Ba39JmOX7-A2VZb*K#(=a5Tc1l8#Q95u9IFzx=K>(GAV5_YGDnHMO!lZF*-x zxAnB4B~x}rGgaN}>FC#0r?*R2HPg{|=~_;bYH&%rnaXN|wKHeUo-;QP;B$sCLsk;` zwEjq5clIh_QRL4E%nM7R^3hI}7TId4%%bYv2?XZdCWek+>)}LZGD58)Ubhm&v$&cb>49WKHj@F!ft3Y4)H=i+><$7LA723&=! zaSg7;E!d77xE<5D8x72&g$_Q3kK+@#9}nPj_&mOVFX3x=7~jGp_zoV$kMR@y6u-c) z@f$pe-{M*P70=^ucme;yOL$qR5oQbXg$2SwVVMvSmJ7EF8--0mn~)UJLXXhP-4MK; z4jw3Vi?-aoG#)Qy?Lr?H+cib#+BV}X+ySXXf66~Nf(e?}{Cr{R)6jdg%bQTBM>|5nGM!si4f1TWu=mGln>X+x5x@e ze6T(k3o0z*#Q!?>zk@Syj$;1;T*Qf3g$f3-4wvFeiuH}S8Jn>MTPfZXn8Y2p6E*C? zUVNCM-@yX*<6hi{PvTP)`%mLD_#(cHui&eA2;Za(ID&6e{J)3q;|KT|9>e2!0zY>% zVGw`BpYZ1qvE5o8+jwF8*v?w97>{ibfX~1U%RmM9EX2xqe> z6Nizc2&4$n^$=aGv3Ubrx)AEv6sC8N<7vQ-oSH;ydb-u3_Ek2wN4Hj}L-xR3>`Hn&UMWn9e8!6C>DG!6&^xPgQ#$mETM Z-