Tusker.xcodeproj/project.pbxproj

@@ -183,10 +183,6 @@
 		D6A3BC8A2321F79B00FD64D5 /* AccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC882321F79B00FD64D5 /* AccountTableViewCell.swift */; };
 		D6A3BC8B2321F79B00FD64D5 /* AccountTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC892321F79B00FD64D5 /* AccountTableViewCell.xib */; };
 		D6A3BC8F2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */; };
-		D6A5BB2B23BAEF61003BF21D /* APIMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB2A23BAEF61003BF21D /* APIMocks.swift */; };
-		D6A5BB2D23BBA9C4003BF21D /* MyProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB2C23BBA9C4003BF21D /* MyProfileTests.swift */; };
-		D6A5BB2F23BBAC97003BF21D /* DelegatingResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB2E23BBAC97003BF21D /* DelegatingResponse.swift */; };
-		D6A5BB3123BBAD87003BF21D /* JSONResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB3023BBAD87003BF21D /* JSONResponse.swift */; };
 		D6A5FAF1217B7E05003DB2D9 /* ComposeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */; };
 		D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; };
 		D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */; };
@@ -469,10 +465,6 @@
 		D6A3BC882321F79B00FD64D5 /* AccountTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountTableViewCell.swift; sourceTree = "<group>"; };
 		D6A3BC892321F79B00FD64D5 /* AccountTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountTableViewCell.xib; sourceTree = "<group>"; };
 		D6A3BC8D2321FFB900FD64D5 /* StatusActionAccountListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusActionAccountListTableViewController.swift; sourceTree = "<group>"; };
-		D6A5BB2A23BAEF61003BF21D /* APIMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIMocks.swift; sourceTree = "<group>"; };
-		D6A5BB2C23BBA9C4003BF21D /* MyProfileTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyProfileTests.swift; sourceTree = "<group>"; };
-		D6A5BB2E23BBAC97003BF21D /* DelegatingResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DelegatingResponse.swift; sourceTree = "<group>"; };
-		D6A5BB3023BBAD87003BF21D /* JSONResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONResponse.swift; sourceTree = "<group>"; };
 		D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeViewController.xib; sourceTree = "<group>"; };
 		D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIActivity+Types.swift"; sourceTree = "<group>"; };
 		D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMesasgeActivity.swift; sourceTree = "<group>"; };
@@ -1135,23 +1127,6 @@
 			path = "Status Action Account List";
 			sourceTree = "<group>";
 		};
-		D6A5BB2623BAC88E003BF21D /* Preferences */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Preferences;
-			sourceTree = "<group>";
-		};
-		D6A5BB2923BAEF51003BF21D /* API Mocks */ = {
-			isa = PBXGroup;
-			children = (
-				D6A5BB2E23BBAC97003BF21D /* DelegatingResponse.swift */,
-				D6A5BB3023BBAD87003BF21D /* JSONResponse.swift */,
-				D6A5BB2A23BAEF61003BF21D /* APIMocks.swift */,
-			);
-			path = "API Mocks";
-			sourceTree = "<group>";
-		};
 		D6AEBB3F2321640F00E5038B /* Activities */ = {
 			isa = PBXGroup;
 			children = (
@@ -1299,11 +1274,8 @@
 		D6D4DDEE212518A200E1C4BB /* TuskerUITests */ = {
 			isa = PBXGroup;
 			children = (
-				D6A5BB2923BAEF51003BF21D /* API Mocks */,
 				D6D4DDEF212518A200E1C4BB /* TuskerUITests.swift */,
 				D65F613323AEAB6600F3CFD3 /* OnboardingTests.swift */,
-				D6A5BB2C23BBA9C4003BF21D /* MyProfileTests.swift */,
-				D6A5BB2623BAC88E003BF21D /* Preferences */,
 				D6D4DDF1212518A200E1C4BB /* Info.plist */,
 			);
 			path = TuskerUITests;
@@ -1839,11 +1811,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D6A5BB3123BBAD87003BF21D /* JSONResponse.swift in Sources */,
 				D65F613423AEAB6600F3CFD3 /* OnboardingTests.swift in Sources */,
-				D6A5BB2F23BBAC97003BF21D /* DelegatingResponse.swift in Sources */,
-				D6A5BB2D23BBA9C4003BF21D /* MyProfileTests.swift in Sources */,
-				D6A5BB2B23BAEF61003BF21D /* APIMocks.swift in Sources */,
 				D6D4DDF0212518A200E1C4BB /* TuskerUITests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Tusker/LocalData.swift

@@ -17,13 +17,6 @@ class LocalData {
     private init() {
         if ProcessInfo.processInfo.environment.keys.contains("UI_TESTING") {
             defaults = UserDefaults(suiteName: "\(Bundle.main.bundleIdentifier!).uitesting")!
-            if ProcessInfo.processInfo.environment.keys.contains("UI_TESTING_LOGIN") {
-                defaults.set(true, forKey: onboardingCompleteKey)
-                defaults.set(URL(string: "http://localhost:8080")!, forKey: instanceURLKey)
-                defaults.set("client_id", forKey: clientIDKey)
-                defaults.set("client_secret", forKey: clientSecretKey)
-                defaults.set("access_token", forKey: accessTokenKey)
-            }
         } else {
             defaults = UserDefaults()
         }

Tusker/Screens/Compose/ComposeViewController.swift

@@ -493,20 +493,10 @@ class ComposeViewController: UIViewController {
             options.resizeMode = .none
             options.isNetworkAccessAllowed = true
             PHImageManager.default().requestImageDataAndOrientation(for: asset, options: options) { (data, dataUTI, orientation, info) in
-                guard var data = data, let dataUTI = dataUTI else { fatalError() }
+                guard let data = data, let dataUTI = dataUTI else { fatalError() }
+                
+                let mimeType = UTTypeCopyPreferredTagWithClass(dataUTI as CFString, kUTTagClassMIMEType)!.takeRetainedValue() as String
                 
-                let mimeType: String
-                if dataUTI == "public.heic" {
-                    // neither Mastodon nor Pleroma handles HEIC well, so convert to JPEG
-                    let image = CIImage(data: data)!
-                    let context = CIContext()
-                    let colorSpace = image.colorSpace ?? CGColorSpace(name: CGColorSpace.sRGB)!
-                    data = context.jpegRepresentation(of: image, colorSpace: colorSpace, options: [:])!
-                    mimeType = "image/jpeg"
-                } else {
-                    mimeType = UTTypeCopyPreferredTagWithClass(dataUTI as CFString, kUTTagClassMIMEType)!.takeRetainedValue() as String
-                }
-
                 self.postProgressView.step()
                 
                 let request = MastodonController.client.upload(attachment: FormAttachment(mimeType: mimeType, data: data, fileName: "file"), description: description)

Tusker/Screens/Onboarding/InstanceSelectorTableViewController.swift

@@ -26,7 +26,6 @@ class InstanceSelectorTableViewController: UITableViewController {
     var recommendedInstances: [InstanceSelector.Instance] = []
     
     let urlCheckerSubject = PassthroughSubject<String?, Never>()
-    var urlHandler: AnyCancellable?
     var currentQuery: String?
     
     init() {
@@ -67,7 +66,7 @@ class InstanceSelectorTableViewController: UITableViewController {
         navigationItem.searchController = searchController
         definesPresentationContext = true
         
-        urlHandler = urlCheckerSubject
+        _ = urlCheckerSubject
             .debounce(for: .seconds(1), scheduler: RunLoop.main)
             .compactMap { $0?.trimmingCharacters(in: .whitespacesAndNewlines) }
             .sink(receiveValue: updateSpecificInstance)

Tusker/Screens/Profile/MyProfileTableViewController.swift

@@ -22,8 +22,9 @@ class MyProfileTableViewController: ProfileTableViewController {
             self.accountID = account.id
             
             ImageCache.avatars.get(account.avatar, completion: { (data) in
-                guard let data = data, let image = UIImage(data: data) else { return }
+                guard let data = data else { return }
                 DispatchQueue.main.async {
+                    let image = UIImage(data: data)!
                     let size = CGSize(width: 30, height: 30)
                     let tabBarImage = UIGraphicsImageRenderer(size: size).image { (_) in
                         image.draw(in: CGRect(origin: .zero, size: size))

TuskerUITests/API Mocks/APIMocks.swift

@@ -1,77 +0,0 @@
-//
-//  APIMocks.swift
-//  TuskerUITests
-//
-//  Created by Shadowfacts on 12/30/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import Ambassador
-
-fileprivate let notFound = ["error": "Record not found"]
-
-extension Router {
-    func allRoutes() {
-        instanceRoutes()
-        accountRoutes()
-        timelineRoutes()
-        notificationRoutes()
-    }
-    
-    func instanceRoutes() {
-        self["/api/v1/instance"] = JSONResponse(handler: { (_) in
-            return [
-                "description": "An instance description",
-                "max_toot_chars": 500,
-                "thumbnail": "http://localhost:8080/thumbnail.png",
-                "title": "Localhost",
-                "uri": "http://localhost:8080",
-                "version": "2.7.2",
-                "urls": [:]
-            ]
-        })
-    }
-    
-    func accountRoutes() {
-        let selfAccount: [String: Any] = [
-            "id": "1",
-            "username": "admin",
-            "acct": "admin",
-            "display_name": "Admin Account",
-            "locked": false,
-            "created_at": "2019-12-31T11:13:42.0Z",
-            "followers_count": 0,
-            "following_count": 0,
-            "statuses_count": 0,
-            "note": "My profile description.",
-            "url": "http://localhost:8080/users/admin",
-            "avatar": "http://localhost:8080/avatar/admin.jpg",
-            "avatar_static": "http://localhost:8080/avatar/admin.jpg",
-            "header": "http://localhost:8080/header/admin.jpg",
-            "header_static": "http://localhost:8080/header/admin.jpg",
-            "emojis": []
-        ]
-        self["/api/v1/accounts/verify_credentials"] = JSONResponse(result: selfAccount)
-        self["/api/v1/accounts/\\d+/statuses"] = JSONResponse(result: [])
-        self["/api/v1/accounts/(\\d+)"] = DelegatingResponse { (env) in
-            let captures = env["ambassador.router_captures"] as! [String]
-            if captures[0] == "1" {
-                return JSONResponse(result: selfAccount)
-            } else {
-                return JSONResponse(statusCode: 404, statusMessage: "Not Found", result: notFound)
-            }
-        }
-    }
-    
-    func timelineRoutes() {
-        let emptyTimeline: [Any] = []
-        self["/api/v1/timelines/home"] = JSONResponse(result: emptyTimeline)
-        self["/api/v1/timelines/public"] = JSONResponse(result: emptyTimeline)
-    }
-    
-    func notificationRoutes() {
-        let emptyTimeline: [Any] = []
-        self["/api/v1/notifications"] = JSONResponse(result: emptyTimeline)
-    }
-}

TuskerUITests/API Mocks/DelegatingResponse.swift

@@ -1,18 +0,0 @@
-//
-//  DelegatingResponse.swift
-//  TuskerUITests
-//
-//  Created by Shadowfacts on 12/31/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import Ambassador
-
-struct DelegatingResponse: WebApp {
-    let handler: (_ environ: [String: Any]) -> WebApp
-    
-    func app(_ environ: [String : Any], startResponse: @escaping ((String, [(String, String)]) -> Void), sendBody: @escaping ((Data) -> Void)) {
-        handler(environ).app(environ, startResponse: startResponse, sendBody: sendBody)
-    }
-}

TuskerUITests/API Mocks/JSONResponse.swift

@@ -1,18 +0,0 @@
-//
-//  JSONResponse.swift
-//  TuskerUITests
-//
-//  Created by Shadowfacts on 12/31/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import Ambassador
-
-extension JSONResponse {
-    init(statusCode: Int = 200, statusMessage: String = "OK", result: Any) {
-        self.init(statusCode: statusCode, statusMessage: statusMessage, handler: { (_) in
-            return result
-        })
-    }
-}

TuskerUITests/MyProfileTests.swift

@@ -1,26 +0,0 @@
-//
-//  MyProfileTests.swift
-//  TuskerUITests
-//
-//  Created by Shadowfacts on 12/31/19.
-//  Copyright © 2019 Shadowfacts. All rights reserved.
-//
-
-import XCTest
-
-class MyProfileTests: TuskerUITests {
-
-    override func setUp() {
-        super.setUp()
-        
-        router.allRoutes()
-
-        app.launchEnvironment["UI_TESTING_LOGIN"] = "true"
-        app.launch()
-    }
-
-    func testExample() {
-        sleep(10000000)
-    }
-
-}

TuskerUITests/OnboardingTests.swift

@@ -14,14 +14,20 @@ class OnboardingTests: TuskerUITests {
     override func setUp() {
         super.setUp()
         
-        router.instanceRoutes()
+        router["/api/v1/instance"] = JSONResponse(handler: { (_) in
-        
+            return [
-        app.launch()
+                "description": "An instance description",
+                "max_toot_chars": 500,
+                "thumbnail": "http://localhost:8080/thumbnail.png",
+                "title": "Localhost",
+                "uri": "http://localhost:8080",
+                "version": "2.7.2",
+                "urls": [:]
+            ]
+        })
     }
-
-    // can't test logging in because there's no way of interacting with the safari VC that's used in the OAuth flow
     
-    func testCustomInstanceAppears() {
+    func testExample() {
         let searchField = app.searchFields.element
         searchField.tap()
         searchField.typeText("http://localhost:8080")

TuskerUITests/TuskerUITests.swift

@@ -45,6 +45,7 @@ class TuskerUITests: XCTestCase {
         continueAfterFailure = false
         app = XCUIApplication()
         app.launchEnvironment["UI_TESTING"] = "true"
+        app.launch()
     }
 
     override func tearDown() {