Fixed various project warnings. Completely disabled nullability check…

…s, went down from ~20k to 195.
element-hq · Feb 10, 2022 · 4bd5c12 · 4bd5c12
1 parent 850cad4
commit 4bd5c12
Show file tree

Hide file tree

Showing 85 changed files with 465 additions and 679 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -36,7 +36,7 @@ line_length:
   error: 1000
 
 file_length:
-  warning: 700
+  warning: 800
   error: 1000
 
 type_body_length:

diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -146,8 +146,6 @@ final class BuildSettings: NSObject {
     static let stunServerFallbackUrlString: String? = "stun:turn.matrix.org"
 
     // MARK: -  Public rooms Directory
-    #warning("Unused build setting: should this be implemented in ShowDirectory?")
-    static let publicRoomsAllowServerChange: Bool = true
     // List of homeservers for the public rooms directory
     static let publicRoomsDirectoryServers = [
         "matrix.org",

diff --git a/Config/Project-Warnings.xcconfig b/Config/Project-Warnings.xcconfig
@@ -46,3 +46,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES
 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
 GCC_WARN_UNUSED_FUNCTION = YES
 GCC_WARN_UNUSED_VARIABLE = YES
+
+WARNING_CFLAGS = $(inherited) -Wno-nullability-completeness;
+OTHER_SWIFT_FLAGS = $(inherited) -Xcc -Wno-nullability-completeness
+
diff --git a/Podfile b/Podfile
@@ -49,7 +49,6 @@ end
 ########################################
 
 def import_MatrixKit_pods
-  pod 'HPGrowingTextView', '~> 1.1'  
   pod 'libPhoneNumber-iOS', '~> 0.9.13'  
   pod 'DTCoreText', '~> 1.6.25'
   #pod 'DTCoreText/Extension', '~> 1.6.25'
@@ -98,7 +97,7 @@ abstract_target 'RiotPods' do
     pod 'DSWaveformImage', '~> 6.1.1'
     pod 'ffmpeg-kit-ios-audio', '4.5.1'
 
-    pod 'FLEX', '~> 4.5.0', :configurations => ['Debug']
+    pod 'FLEX', '~> 4.5.0', :configurations => ['Debug'], :inhibit_warnings => true
 
     target 'RiotTests' do
       inherit! :search_paths
@@ -149,6 +148,10 @@ post_install do |installer|
 
       # Stop Xcode 12 complaining about old IPHONEOS_DEPLOYMENT_TARGET from pods
       config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+
+      # Disable nullability checks
+      config.build_settings['WARNING_CFLAGS'] ||= ['$(inherited)','-Wno-nullability-completeness']
+      config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-Xcc', '-Wno-nullability-completeness']
     end
   end
 end
diff --git a/Riot/Assets/Base.lproj/Main.storyboard b/Riot/Assets/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -46,24 +46,6 @@
             </objects>
             <point key="canvasLocation" x="-153" y="-419"/>
         </scene>
-        <!--Room Member Details View Controller-->
-        <scene sceneID="eq5-qi-gDd">
-            <objects>
-                <viewController id="nDS-pp-sWM" customClass="RoomMemberDetailsViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="AgI-3V-llt"/>
-                        <viewControllerLayoutGuide type="bottom" id="6ie-9b-cBo"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="N8z-LO-417">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="e8Z-uW-oDv" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="5047" y="-1437"/>
-        </scene>
         <!--Room Search View Controller-->
         <scene sceneID="rUg-1s-vHX">
             <objects>
@@ -116,14 +98,6 @@
             </objects>
             <point key="canvasLocation" x="2558" y="180"/>
         </scene>
-        <!--Segmented View Controller-->
-        <scene sceneID="NZu-Q0-P0z">
-            <objects>
-                <tableViewController id="e7G-NU-7ck" customClass="SegmentedViewController" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="fXh-hO-Zgf" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="3326" y="-442"/>
-        </scene>
         <!--People View Controller-->
         <scene sceneID="Qba-PP-lco">
             <objects>
@@ -501,24 +475,6 @@
             </objects>
             <point key="canvasLocation" x="1385" y="180"/>
         </scene>
-        <!--Contacts Table View Controller-->
-        <scene sceneID="2zi-xJ-RQo">
-            <objects>
-                <viewController id="udm-55-AMb" customClass="ContactsTableViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Jch-ZS-1Mm"/>
-                        <viewControllerLayoutGuide type="bottom" id="7q1-ig-sPp"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="6G9-nj-ktC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="uv3-zI-b3q" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="374" y="449"/>
-        </scene>
         <!--Thread-->
         <scene sceneID="Opl-gU-pwm">
             <objects>

diff --git a/Riot/Managers/BugReport/RageShakeManager.m b/Riot/Managers/BugReport/RageShakeManager.m
@@ -200,7 +200,7 @@ - (UIImage*)takeScreenshot {
 
     UIImage *image;
 
-    AppDelegate* theDelegate = [AppDelegate theDelegate];
+    LegacyAppDelegate* theDelegate = [AppDelegate theDelegate];
     UIGraphicsBeginImageContextWithOptions(theDelegate.window.bounds.size, NO, [UIScreen mainScreen].scale);
 
     // Iterate over every window from back to front

diff --git a/Riot/Managers/PushNotification/PushNotificationService.h b/Riot/Managers/PushNotification/PushNotificationService.h
@@ -108,7 +108,6 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param pushNotificationService PushNotificationService object.
  @param roomId Room identifier to be navigated.
- @param eventId Event identifier to be navigated around.
  */
 - (void)pushNotificationService:(PushNotificationService *)pushNotificationService
      shouldNavigateToRoomWithId:(NSString *)roomId;

diff --git a/Riot/Managers/Widgets/WidgetManager.m b/Riot/Managers/Widgets/WidgetManager.m
@@ -338,7 +338,6 @@ - (MXHTTPOperation *)closeWidget:(NSString *)widgetId inRoom:(MXRoom *)room succ
  Check user's power for widgets management in a room.
  
  @param room the room to check.
- @return an NSError if the user cannot act on widgets in this room. Else, nil.
  */
 - (void)checkWidgetPermissionInRoom:(MXRoom *)room success:(dispatch_block_t)success  failure:(void (^)(NSError *))failure
 {
@@ -742,6 +741,8 @@ - (NSString *)scalarTokenForMXSession:(MXSession *)mxSession
     return configs[mxSession.myUser.userId].scalarToken;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)loadConfigs
 {
     NSUserDefaults *userDefaults = [MXKAppSettings standardAppSettings].sharedUserDefaults;
@@ -787,6 +788,7 @@ - (void)saveConfigs
     [userDefaults setObject:[NSKeyedArchiver archivedDataWithRootObject:configs]
                      forKey:@"integrationManagerConfigs"];
 }
+#pragma clang diagnostic pop
 
 
 #pragma mark - Errors