Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct MailPluginManager {
panel.prompt = "Install"
panel.canCreateDirectories = true
panel.showsTagField = false
panel.message = "OpenHaystack has no right to access the directory to install the plug-in automatically. By clicking install you grant the persmission."
panel.message = "OpenHaystack has no right to access the directory to install the plug-in automatically. By clicking install you grant the permission."

if FileManager.default.fileExists(atPath: self.pluginsFolderURL.path) {
panel.directoryURL = self.pluginsFolderURL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ struct AccessoryListEntry: View {
pasteboard.prepareForNewContents(with: .currentHostOnly)
pasteboard.setString(publicKey.base64EncodedString(), forType: .string)
} catch {
os_log("Failed extracing public key %@", String(describing: error))
os_log("Failed extracting public key %@", String(describing: error))
assert(false)
}
}
Expand All @@ -127,7 +127,7 @@ struct AccessoryListEntry: View {
pasteboard.prepareForNewContents(with: .currentHostOnly)
pasteboard.setString(publicKey.base64EncodedString(), forType: .string)
} catch {
os_log("Failed extracing public key %@", String(describing: error))
os_log("Failed extracting public key %@", String(describing: error))
assert(false)
}
}
Expand All @@ -139,7 +139,7 @@ struct AccessoryListEntry: View {
pasteboard.prepareForNewContents(with: .currentHostOnly)
pasteboard.setString(keyID, forType: .string)
} catch {
os_log("Failed extracing public key %@", String(describing: error))
os_log("Failed extracting public key %@", String(describing: error))
assert(false)
}
}
Expand All @@ -161,7 +161,7 @@ struct AccessoryListEntry: View {
pasteboard.setString(string, forType: .string)
}
} catch {
os_log("Failed extracing public key %@", String(describing: error))
os_log("Failed extracting public key %@", String(describing: error))
assert(false)
}
}
Expand All @@ -177,7 +177,7 @@ struct AccessoryListEntry: View {
pasteboard.prepareForNewContents(with: .currentHostOnly)
pasteboard.setString("Symmetric key: \(symmetricKeyString)\n Uncompressed public key: \(publicKeyString) ", forType: .string)
} catch {
os_log("Failed extracing public key %@", String(describing: error))
os_log("Failed extracting public key %@", String(describing: error))
assert(false)
}
}
Expand All @@ -191,7 +191,7 @@ struct AccessoryListEntry: View {
pasteboard.prepareForNewContents(with: .currentHostOnly)
pasteboard.setString("Symmetric key: \(symmetricKey.base64EncodedString())\n Uncompressed public key: \(publicKey.base64EncodedString()) ", forType: .string)
} catch {
os_log("Failed extracing public key %@", String(describing: error))
os_log("Failed extracting public key %@", String(describing: error))
assert(false)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ struct ManageAccessoriesView: View {
VStack {
Text("Select target")
.font(.title)
Text("Please select to which device you want to deply")
Text("Please select to which device you want to deploy")
.padding(.bottom, 4)

VStack {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ struct OpenHaystackMainView: View {
dismissButton: Alert.Button.okay())
case .deployedSuccessfully:
return Alert(
title: Text("Deploy successfull"),
title: Text("Deploy successful"),
message: Text("This device will now be tracked by all iPhones and you can use this app to find its last reported location"),
dismissButton: Alert.Button.okay())
case .deletionFailed:
Expand Down Expand Up @@ -381,7 +381,7 @@ struct OpenHaystackMainView: View {
title: Text("Mail Plugin installation failed"),
message: Text(
"To access the location reports of your devices an Apple Mail plugin is necessary"
+ "\nThe installtion of this plugin has failed.\n\n Please download it manually unzip it and move it to /Library/Mail/Bundles"),
+ "\nThe installation of this plugin has failed.\n\n Please download it manually unzip it and move it to /Library/Mail/Bundles"),
primaryButton: .default(
Text("Download plug-in"),
action: {
Expand Down
2 changes: 1 addition & 1 deletion OpenHaystack/OpenHaystackTests/MicrocontrollerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class MicrocontrollerTests: XCTestCase {
let pattern = Data([0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x0, 0x1])
let key = Data([1, 1, 1, 1, 1, 1, 1, 1])
_ = try MicrobitController.patchFirmware(firmware, pattern: pattern, with: key)
XCTFail("Should thrown an erorr before")
XCTFail("Should thrown an error before")
} catch PatchingError.patternNotFound {
// This should be thrown
} catch {
Expand Down
2 changes: 1 addition & 1 deletion openhaystack-mobile/lib/deployment/deployment_email.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class DeploymentEmail {
String mailContent = 'Linux HCI Deployment:\n\n'
'Requirements\n'
'Install the hcitool software on a Bluetooth Low Energy Linux device, '
'for example a Raspberry Pi. Additionally Pyhton 3 needs to be '
'for example a Raspberry Pi. Additionally Python 3 needs to be '
'installed.\n\n'
'Download\n'
'Next download the python script that configures the HCI tool to '
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DeploymentInstructionsLinux extends StatelessWidget {
title: Text('Requirements'),
content: Text('Install the hcitool software on a Bluetooth '
'Low Energy Linux device, for example a Raspberry Pi. '
'Additionally Pyhton 3 needs to be installed.'),
'Additionally Python 3 needs to be installed.'),
),
Step(
title: const Text('Download'),
Expand Down
10 changes: 5 additions & 5 deletions openhaystack-mobile/lib/item_management/item_file_import.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ItemFileImport extends StatefulWidget {
final String filePath;

/// Lets the user select which accessories to import from a file.
///
///
/// Displays the accessories contained in the import file.
/// The user can then select the accessories to import.
const ItemFileImport({
Expand Down Expand Up @@ -55,7 +55,7 @@ class _ItemFileImportState extends State<ItemFileImport> {
hasError = true;
errorText = 'Invalid file path. Please select another file.';
});

return;
}

Expand Down Expand Up @@ -117,7 +117,7 @@ class _ItemFileImportState extends State<ItemFileImport> {
}
}

var nrOfImports = selected?.fold<int>(0,
var nrOfImports = selected?.fold<int>(0,
(previousValue, element) => element ? previousValue + 1 : previousValue) ?? 0;
if (nrOfImports > 0) {
var snackbar = SnackBar(
Expand Down Expand Up @@ -174,12 +174,12 @@ class _ItemFileImportState extends State<ItemFileImport> {
child: Column(
children: [
Text(
'An error occured.',
'An error occurred.',
style: Theme.of(context).textTheme.headline5,
),
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(errorText ?? 'An unknown error occured. Please try again.'),
child: Text(errorText ?? 'An unknown error occurred. Please try again.'),
),
],
),
Expand Down