Skip to content

Commit

Permalink
Commit of version 1.0.3 - Please see changelog for more info.
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonMeier committed Feb 29, 2016
1 parent 24ec41d commit 04c1f4b
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 30 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
#fliclib-ios 1.0.3

**Changes**

* Changes to BLE reconnectien
* Internal rework
* Updated error codes

**Issues Fixed**

* Fixed issue that caused connection to fail if you set mode directly before initiating a connection.
* Fixed issue in outgoing packet signing that caused an invalid signature on packets send if the app was crashed and relaunched in the background during an active Flic connection.

#fliclib-ios 0.9.5

**Changes**
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# fliclib-ios
The fliclib framework for iOS.
This framework works in collaboration with the Flic app so please make sure that you have it installed before you begin.
For instructions on how to implement this go to https://flic.io/partners/developers/ios-tutorial, or take a look at one of our example projects here on github.
89 changes: 68 additions & 21 deletions fliclib.framework/Headers/SCLFlicButton.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// @framework fliclib
//
// Created by Anton Meier on 2014-06-18.
// Copyright (c) 2015 Shortcut Labs. All rights reserved.
// Copyright (c) 2016 Shortcut Labs. All rights reserved.
//

#import <Foundation/Foundation.h>
Expand Down Expand Up @@ -153,63 +153,111 @@ typedef NS_ENUM(NSInteger, SCLFlicError) {
/**
* General error code that can be sent to let you know that a started task did not complete.
*/
SCLFlicErrorCouldNotCompleteTask,
SCLFlicErrorCouldNotCompleteTask = 1,
/**
* If a connection to a flic button failed for unknown reasons. This could for example be if flic is brought out of range during a connection sequense.
* If a connection to a button failed for unknown reasons. This could for example be if it is brought out of range during a connection sequense.
*/
SCLFlicErrorConnectionFailed,
SCLFlicErrorConnectionFailed = 2,
/**
* The RSSI value could not be read.
*/
SCLFlicErrorCouldNotUpdateRSSI,
SCLFlicErrorCouldNotUpdateRSSI = 3,
/**
* The internal database that is used in order to keep track of the buttons is not available or can not be accessed.
*/
SCLFlicErrorDatabaseError,
SCLFlicErrorDatabaseError = 4,
/**
* If the flic button sends unknown data to the iOS device that does not comply with our communication protocol specification.
* If the button sends unknown data to the iOS device that does not comply with our communication protocol specification.
*/
SCLFlicErrorUnknownDataReceived,
SCLFlicErrorUnknownDataReceived = 5,
/**
* If for some reason the button does not responde in time during the verification process.
*/
SCLFlicErrorVerificationTimeOut,
SCLFlicErrorVerificationTimeOut = 6,
/**
* The backend that is used for the initial verification sequence can not be reached.
*/
SCLFlicErrorBackendUnreachable,
SCLFlicErrorBackendUnreachable = 7,
/**
* The iOS device does not have an internet connection that is required in order to complete the task.
*/
SCLFlicErrorNoInternetConnection,
SCLFlicErrorNoInternetConnection = 8,
/**
* The response from the backend server is invalid.
*/
SCLFlicErrorCredentialsNotMatching,
SCLFlicErrorCredentialsNotMatching = 9,
/**
* If you try to access a flic that is currently being used with another device or another app on the same iOS device.
* If you try to access a button that is currently being used with another device, or another app on the same iOS device.
*/
SCLFlicErrorButtonIsPrivate,
SCLFlicErrorButtonIsPrivate = 10,
/**
* A crypthographic error has occurred.
*/
SCLFlicErrorCryptographicFailure,
SCLFlicErrorCryptographicFailure = 11,
/**
* For some reason the button was disconnected before the verification sequense had time to complete.
*/
SCLFlicErrorButtonDisconnectedDuringVerification,
SCLFlicErrorButtonDisconnectedDuringVerification = 12,
/**
* The request did not contain enough data to be completed.
*/
SCLFlicErrorMissingData,
SCLFlicErrorMissingData = 13,
/**
* The signature over the data is not valid. The data might be corrupt.
*/
SCLFlicErrorInvalidSignature,
SCLFlicErrorInvalidSignature = 14,
/**
* You are trying to grab a button that you have already grabbed before.
* You are trying to grab a Flic button that you have already grabbed before.
*/
SCLFlicErrorButtonAlreadyGrabbed,
SCLFlicErrorButtonAlreadyGrabbed = 15,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorUnknown = 100,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorInvalidParameters = 101,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorInvalidHandle = 102,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorNotConnected = 103,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorOutOfSpace = 104,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorOperationCancelled = 105,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorConnectionLost = 106,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorPeripheralDisconnected = 107,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorUUIDNotAllowed = 108,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorAlreadyAdvertising = 109,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorConnectionFailed = 110,
/**
* Bluetooth specific error
*/
SCLFlicErrorBluetoothErrorConnectionLimitReached = 111,
};

@protocol SCLFlicButtonDelegate;
Expand Down Expand Up @@ -258,7 +306,6 @@ typedef NS_ENUM(NSInteger, SCLFlicError) {
*/
@property (atomic, readonly, strong, nonnull) NSString *name;


/*!
* @property state
*
Expand Down
2 changes: 1 addition & 1 deletion fliclib.framework/Headers/SCLFlicManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// @framework fliclib
//
// Created by Anton Meier on 2014-06-18.
// Copyright (c) 2014 Shortcut Labs. All rights reserved.
// Copyright (c) 2016 Shortcut Labs. All rights reserved.
//

#import <Foundation/Foundation.h>
Expand Down
2 changes: 1 addition & 1 deletion fliclib.framework/Headers/fliclib.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// fliclib
//
// Created by Anton Meier on 2014-10-13.
// Copyright (c) 2014 Shortcut Labs. All rights reserved.
// Copyright (c) 2016 Shortcut Labs. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
Binary file modified fliclib.framework/Info.plist
Binary file not shown.
14 changes: 7 additions & 7 deletions fliclib.framework/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
<dict>
<key>Headers/SCLFlicButton.h</key>
<data>
LOOJi9l7l10uV+BU4oDvMhfLFgA=
Xrcc+K/GSfnxhYjLEueMTrqa1PM=
</data>
<key>Headers/SCLFlicManager.h</key>
<data>
2R3oW00b/ytaYBGgYkFeiZcFuOA=
XE/G6O6H1md4OChQBssbAwLPgsA=
</data>
<key>Headers/fliclib.h</key>
<data>
lJgn4ow64Lb3JweGZffzUhsYVSA=
A98A3mz/q1FXYtN0hzBWzK3NE3s=
</data>
<key>Info.plist</key>
<data>
CEcH5ZSzz8dTBGQV9Dt7nQzgNps=
Kd6efcVzZmHNjS7yRPZam0o3Mi8=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand All @@ -29,15 +29,15 @@
<dict>
<key>Headers/SCLFlicButton.h</key>
<data>
LOOJi9l7l10uV+BU4oDvMhfLFgA=
Xrcc+K/GSfnxhYjLEueMTrqa1PM=
</data>
<key>Headers/SCLFlicManager.h</key>
<data>
2R3oW00b/ytaYBGgYkFeiZcFuOA=
XE/G6O6H1md4OChQBssbAwLPgsA=
</data>
<key>Headers/fliclib.h</key>
<data>
lJgn4ow64Lb3JweGZffzUhsYVSA=
A98A3mz/q1FXYtN0hzBWzK3NE3s=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down
Binary file modified fliclib.framework/fliclib
Binary file not shown.

0 comments on commit 04c1f4b

Please sign in to comment.