Skip to content

Commit

Permalink
fix: remove nfc traces and fix missing cryptoswift import (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
0x7061 authored Sep 25, 2024
1 parent 76fd413 commit 8220750
Show file tree
Hide file tree
Showing 14 changed files with 670 additions and 812 deletions.
2 changes: 1 addition & 1 deletion EvvaSfwAbrevvaCapacitor.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ TODO: Add long description of the pod here.
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'

s.dependency 'Capacitor'
s.dependency 'AbrevvaSDK', '~> 1.0.23'
s.dependency 'AbrevvaSDK', '~> 1.0.31'
end

This file was deleted.

20 changes: 0 additions & 20 deletions ios/Plugin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

/* Begin PBXBuildFile section */
07B3CCBD2B5EA60C00F2C9EA /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCBC2B5EA60C00F2C9EA /* Logging.swift */; };
07B3CCC12B5EBC7300F2C9EA /* AbrevvaPluginNFC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCC02B5EBC7300F2C9EA /* AbrevvaPluginNFC.swift */; };
07B3CCC42B5EBCB700F2C9EA /* AbrevvaPluginNFC.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCC32B5EBCB700F2C9EA /* AbrevvaPluginNFC.m */; };
07B3CCC52B5EBD2D00F2C9EA /* AbrevvaPluginNFC.h in Headers */ = {isa = PBXBuildFile; fileRef = 07B3CCC22B5EBC9600F2C9EA /* AbrevvaPluginNFC.h */; settings = {ATTRIBUTES = (Public, ); }; };
07C03F2D2B4EE3A70095BC1A /* AbrevvaPluginCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C03F2A2B4EE3A70095BC1A /* AbrevvaPluginCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; };
07C03F2E2B4EE3A70095BC1A /* AbrevvaPluginCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07C03F2B2B4EE3A70095BC1A /* AbrevvaPluginCrypto.swift */; };
07C03F2F2B4EE3A70095BC1A /* AbrevvaPluginCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 07C03F2C2B4EE3A70095BC1A /* AbrevvaPluginCrypto.m */; };
Expand Down Expand Up @@ -39,9 +36,6 @@
072C8F802B5AAEA2009DC850 /* abrevva_ios_sdk.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = abrevva_ios_sdk.framework; path = "../../../ios/abrevva-ios-sdk/build/abrevva-ios-sdk.xcframework/ios-arm64/abrevva_ios_sdk.framework"; sourceTree = "<group>"; };
072C8F842B5AC1DC009DC850 /* AbrevvaSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AbrevvaSDK.framework; path = "../../../ios/abrevva-ios-sdk/AbrevvaSDK.framework"; sourceTree = "<group>"; };
07B3CCBC2B5EA60C00F2C9EA /* Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = "<group>"; };
07B3CCC02B5EBC7300F2C9EA /* AbrevvaPluginNFC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AbrevvaPluginNFC.swift; sourceTree = "<group>"; };
07B3CCC22B5EBC9600F2C9EA /* AbrevvaPluginNFC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AbrevvaPluginNFC.h; sourceTree = "<group>"; };
07B3CCC32B5EBCB700F2C9EA /* AbrevvaPluginNFC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AbrevvaPluginNFC.m; sourceTree = "<group>"; };
07C03F2A2B4EE3A70095BC1A /* AbrevvaPluginCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbrevvaPluginCrypto.h; sourceTree = "<group>"; };
07C03F2B2B4EE3A70095BC1A /* AbrevvaPluginCrypto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AbrevvaPluginCrypto.swift; sourceTree = "<group>"; };
07C03F2C2B4EE3A70095BC1A /* AbrevvaPluginCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AbrevvaPluginCrypto.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -104,16 +98,6 @@
path = crypto;
sourceTree = "<group>";
};
07B3CCBA2B5E95D800F2C9EA /* nfc */ = {
isa = PBXGroup;
children = (
07B3CCC02B5EBC7300F2C9EA /* AbrevvaPluginNFC.swift */,
07B3CCC22B5EBC9600F2C9EA /* AbrevvaPluginNFC.h */,
07B3CCC32B5EBCB700F2C9EA /* AbrevvaPluginNFC.m */,
);
path = nfc;
sourceTree = "<group>";
};
07B3CCBB2B5EA5EA00F2C9EA /* util */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -158,7 +142,6 @@
children = (
07B3CCB82B5E95BF00F2C9EA /* ble */,
07B3CCB92B5E95CE00F2C9EA /* crypto */,
07B3CCBA2B5E95D800F2C9EA /* nfc */,
07B3CCBB2B5EA5EA00F2C9EA /* util */,
50ADFF8C201F53D600D50D53 /* Info.plist */,
);
Expand Down Expand Up @@ -195,7 +178,6 @@
buildActionMask = 2147483647;
files = (
07C03F2D2B4EE3A70095BC1A /* AbrevvaPluginCrypto.h in Headers */,
07B3CCC52B5EBD2D00F2C9EA /* AbrevvaPluginNFC.h in Headers */,
50ADFF99201F53D600D50D53 /* AbrevvaPluginBLE.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -380,8 +362,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
07B3CCC12B5EBC7300F2C9EA /* AbrevvaPluginNFC.swift in Sources */,
07B3CCC42B5EBCB700F2C9EA /* AbrevvaPluginNFC.m in Sources */,
50E1A94820377CB70090CE1A /* AbrevvaPluginBLE.swift in Sources */,
07B3CCBD2B5EA60C00F2C9EA /* Logging.swift in Sources */,
50ADFFA82020EE4F00D50D53 /* AbrevvaPluginBLE.m in Sources */,
Expand Down
3 changes: 2 additions & 1 deletion ios/Plugin/crypto/AbrevvaPluginCrypto.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import AbrevvaSDK
import Capacitor
import Foundation
import AbrevvaSDK
import CryptoSwift

private enum CryptoError: String {
case EncryptCryptoError
Expand Down
10 changes: 0 additions & 10 deletions ios/Plugin/nfc/AbrevvaPluginNFC.h

This file was deleted.

6 changes: 0 additions & 6 deletions ios/Plugin/nfc/AbrevvaPluginNFC.m

This file was deleted.

6 changes: 0 additions & 6 deletions ios/Plugin/nfc/AbrevvaPluginNFC.swift

This file was deleted.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions src/plugins/nfc/definitions.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/plugins/nfc/index.ts

This file was deleted.

5 changes: 0 additions & 5 deletions src/plugins/nfc/plugin.ts

This file was deleted.

69 changes: 34 additions & 35 deletions test-app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:maxSdkVersion="30" android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:maxSdkVersion="30" android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:maxSdkVersion="30" android:name="android.permission.BLUETOOTH" />
<uses-permission android:maxSdkVersion="30" android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"
tools:targetApi="s" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:maxSdkVersion="30" android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:maxSdkVersion="30" android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:maxSdkVersion="30" android:name="android.permission.BLUETOOTH"/>
<uses-permission android:maxSdkVersion="30" android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation"
tools:targetApi="s"/>
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">

<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:name="io.ionic.starter.MainActivity"
android:exported="true"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
android:launchMode="singleTask">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:name="io.ionic.starter.MainActivity"
android:exported="true"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
android:launchMode="singleTask">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>

</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
</provider>
</application>
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
</provider>
</application>
</manifest>
4 changes: 0 additions & 4 deletions test-app/android/app/src/main/assets/capacitor.plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,5 @@
{
"pkg": "@evva-sfw/abrevva-capacitor",
"classpath": "com.evva.xesar.abrevva.plugins.capacitor.AbrevvaPluginCrypto"
},
{
"pkg": "@evva-sfw/abrevva-capacitor",
"classpath": "com.evva.xesar.abrevva.plugins.capacitor.AbrevvaPluginNFC"
}
]
Loading

0 comments on commit 8220750

Please sign in to comment.