Skip to content

Commit

Permalink
- Updated Reachability library
Browse files Browse the repository at this point in the history
- Replace SSKeychain library with SAMKeychain library.
- Added support for Bitcode.
  • Loading branch information
gameDNA committed Jun 20, 2019
1 parent 7283aac commit b120849
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion MobileUtils.uplugin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "1.11.0",
"VersionName": "1.11.1",
"FriendlyName": "Mobile Utils",
"Description": "Additional utilities for mobile games",
"Category": "Misc",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

We want to make a big mobile plugin with many features from community so feel free to make pull request! After review, if all is good, it will be merged into plugin. Thank you! :-)

* **Current version:** 1.11.0
* **Current version:** 1.11.1
* **Binaries compiled for:** Unreal Engine 4.22
* **Required Unreal Engine 4.22 or above.**

Expand Down
7 changes: 4 additions & 3 deletions Source/MobileUtils/MobileUtils.Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ public MobileUtils(ReadOnlyTargetRules Target) : base(Target)

PublicAdditionalFrameworks.Add(
new Framework(
"SSKeychain",
"../ThirdParty/IOS/SSKeychain.embeddedframework.zip"
)
"SAMKeychain",
"../ThirdParty/IOS/SAMKeychain.embeddedframework.zip",
"SAMKeychain.bundle"
)
);

PublicFrameworks.AddRange(
Expand Down
6 changes: 3 additions & 3 deletions Source/MobileUtils/Private/IOS/MobileUtilsPlatform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "MobileUtilsPlatform.h"

#import <Reachability/Reachability.h>
#import <SSKeychain/SSKeychain.h>
#import <SAMKeychain/SAMKeychain.h>


FMobileUtilsPlatform::FMobileUtilsPlatform()
Expand All @@ -31,12 +31,12 @@ bool FMobileUtilsPlatform::CheckGooglePlayServices()
FString FMobileUtilsPlatform::GetPersistentUniqueDeviceId()
{
NSString *AppName = [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString*)kCFBundleNameKey];
NSString *PersistentUUID = [SSKeychain passwordForService : AppName account : @"incoding"];
NSString *PersistentUUID = [SAMKeychain passwordForService : AppName account : @"incoding"];

if (PersistentUUID == nil)
{
PersistentUUID = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
[SSKeychain setPassword : PersistentUUID forService : AppName account : @"incoding"];
[SAMKeychain setPassword : PersistentUUID forService : AppName account : @"incoding"];
}

return FString(PersistentUUID);
Expand Down
38 changes: 19 additions & 19 deletions Source/ThirdParty/Licenses/sskeychain.tps
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Name>SSKeychain</Name>
<Name>SAMKeychain</Name>
<Location>/MobileUtils/Source/ThirdParty/</Location>
<Date>2017-02-08T18:15:37.607266-04:00</Date>
<Function>Provides SSKeychain to use.</Function>
<Function>Provides SAMKeychain to use.</Function>
<Platforms>
<Platform>IOS</Platform>
<Platform>Android</Platform>
Expand All @@ -18,25 +18,25 @@
<IsSourceAvailable>false</IsSourceAvailable>
<NoticeType>Full EULA Text</NoticeType>
<Notification>
Copyright (c) 2010-2012 Sam Soffes.
Copyright (c) 2010-2016 Sam Soffes, http://soff.es

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</Notification>
</TpsData>
Binary file modified Source/ThirdParty/iOS/Reachability.embeddedframework.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit b120849

Please sign in to comment.