Skip to content

Commit e059f06

Browse files
transphormtransphorm
authored
Bump v2.5.1: ios 122; android 60 (#561)
* increment build to 120 * bump builds for 2.5.1. ios 121; android 60 * clean up logic * upgrade react native firebase for privacy manifests
1 parent 3f3db3c commit e059f06

File tree

10 files changed

+88
-91
lines changed

10 files changed

+88
-91
lines changed

‎app/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ android {
8686
applicationId "com.proofofpassportapp"
8787
minSdkVersion rootProject.ext.minSdkVersion
8888
targetSdkVersion rootProject.ext.targetSdkVersion
89-
versionCode 59
89+
versionCode 60
9090
versionName "2.5.1"
9191
externalNativeBuild {
9292
cmake {

‎app/ios/OpenPassport/PrivacyInfo.xcprivacy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
1010
<key>NSPrivacyAccessedAPITypeReasons</key>
1111
<array>
12-
<string>1C8F.1</string>
1312
<string>CA92.1</string>
13+
<string>1C8F.1</string>
1414
<string>C56D.1</string>
1515
</array>
1616
</dict>

‎app/ios/Podfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use_frameworks!
2-
require 'tmpdir'
2+
require "tmpdir"
33

44
# Resolve react_native_pods.rb with node to allow for hoisting
55
require Pod::Executable.execute_command("node", ["-p",
@@ -10,11 +10,11 @@ require Pod::Executable.execute_command("node", ["-p",
1010

1111
project "Self.xcodeproj"
1212

13-
platform :ios, '15.0' if !ENV['ACT']
13+
platform :ios, "15.0" if !ENV["ACT"]
1414
prepare_react_native_project!
1515

16-
flipper_enabled = ENV['NO_FLIPPER'] != "1"
17-
flipper_config = { 'Flipper' => flipper_enabled ? '~> 0.125.0' : nil }
16+
flipper_enabled = ENV["NO_FLIPPER"] != "1"
17+
flipper_config = { "Flipper" => flipper_enabled ? "~> 0.125.0" : nil }
1818

1919
linkage = ENV["USE_FRAMEWORKS"]
2020
if linkage != nil
@@ -36,21 +36,21 @@ target "Self" do
3636
:path => config[:reactNativePath],
3737
:hermes_enabled => false,
3838
# An absolute path to your application root.
39-
:app_path => "#{Pod::Config.instance.installation_root}/.."
39+
:app_path => "#{Pod::Config.instance.installation_root}/..",
4040
# Flipper設定は削除
4141
)
4242

4343
pod "Sentry", :modular_headers => true
4444
pod "SentryPrivate", :modular_headers => true
4545

46-
pod 'Firebase', :modular_headers => true
47-
pod 'FirebaseCore', :modular_headers => true
48-
pod 'FirebaseCoreInternal', :modular_headers => true
49-
pod 'GoogleUtilities', :modular_headers => true
50-
pod 'FirebaseMessaging'
46+
pod "Firebase", :modular_headers => true
47+
pod "FirebaseCore", :modular_headers => true
48+
pod "FirebaseCoreInternal", :modular_headers => true
49+
pod "GoogleUtilities", :modular_headers => true
50+
pod "FirebaseMessaging"
5151

5252
if flipper_enabled
53-
pod 'RCT-Folly', :podspec => "#{config[:reactNativePath]}/third-party-podspecs/RCT-Folly.podspec"
53+
pod "RCT-Folly", :podspec => "#{config[:reactNativePath]}/third-party-podspecs/RCT-Folly.podspec"
5454
end
5555

5656
post_install do |installer|
@@ -109,7 +109,7 @@ target "Self" do
109109

110110
# update QKCutoutView.swift to hide OCR border
111111
qkCutoutView = "Pods/QKMRZScanner/QKMRZScanner/QKCutoutView.swift"
112-
if File.exist?(qkCutoutView)
112+
if File.exist?(qkCutoutView) && File.writable?(qkCutoutView)
113113
text = File.read(qkCutoutView)
114114
# Only modify if the line is not already commented
115115
if text.match?(/^\s*[^\/]*addBorderAroundCutout\s*\(\s*\)/)
@@ -124,7 +124,7 @@ target "Self" do
124124
# Disable code signing for Pod targets to avoid conflicts with main app signing
125125
installer.pods_project.targets.each do |target|
126126
target.build_configurations.each do |config|
127-
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
127+
config.build_settings["CODE_SIGNING_ALLOWED"] = "NO"
128128
end
129129
end
130130
end

‎app/ios/Podfile.lock‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ PODS:
88
- boost (1.84.0)
99
- DoubleConversion (1.1.6)
1010
- FBLazyVector (0.75.4)
11-
- Firebase (10.20.0):
12-
- Firebase/Core (= 10.20.0)
13-
- Firebase/Core (10.20.0):
11+
- Firebase (10.24.0):
12+
- Firebase/Core (= 10.24.0)
13+
- Firebase/Core (10.24.0):
1414
- Firebase/CoreOnly
15-
- FirebaseAnalytics (~> 10.20.0)
16-
- Firebase/CoreOnly (10.20.0):
17-
- FirebaseCore (= 10.20.0)
18-
- Firebase/Messaging (10.20.0):
15+
- FirebaseAnalytics (~> 10.24.0)
16+
- Firebase/CoreOnly (10.24.0):
17+
- FirebaseCore (= 10.24.0)
18+
- Firebase/Messaging (10.24.0):
1919
- Firebase/CoreOnly
20-
- FirebaseMessaging (~> 10.20.0)
21-
- FirebaseAnalytics (10.20.0):
22-
- FirebaseAnalytics/AdIdSupport (= 10.20.0)
20+
- FirebaseMessaging (~> 10.24.0)
21+
- FirebaseAnalytics (10.24.0):
22+
- FirebaseAnalytics/AdIdSupport (= 10.24.0)
2323
- FirebaseCore (~> 10.0)
2424
- FirebaseInstallations (~> 10.0)
2525
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
2626
- GoogleUtilities/MethodSwizzler (~> 7.11)
2727
- GoogleUtilities/Network (~> 7.11)
2828
- "GoogleUtilities/NSData+zlib (~> 7.11)"
29-
- nanopb (< 2.30910.0, >= 2.30908.0)
30-
- FirebaseAnalytics/AdIdSupport (10.20.0):
29+
- nanopb (< 2.30911.0, >= 2.30908.0)
30+
- FirebaseAnalytics/AdIdSupport (10.24.0):
3131
- FirebaseCore (~> 10.0)
3232
- FirebaseInstallations (~> 10.0)
33-
- GoogleAppMeasurement (= 10.20.0)
33+
- GoogleAppMeasurement (= 10.24.0)
3434
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
3535
- GoogleUtilities/MethodSwizzler (~> 7.11)
3636
- GoogleUtilities/Network (~> 7.11)
3737
- "GoogleUtilities/NSData+zlib (~> 7.11)"
38-
- nanopb (< 2.30910.0, >= 2.30908.0)
39-
- FirebaseCore (10.20.0):
38+
- nanopb (< 2.30911.0, >= 2.30908.0)
39+
- FirebaseCore (10.24.0):
4040
- FirebaseCoreInternal (~> 10.0)
4141
- GoogleUtilities/Environment (~> 7.12)
4242
- GoogleUtilities/Logger (~> 7.12)
43-
- FirebaseCoreExtension (10.20.0):
43+
- FirebaseCoreExtension (10.29.0):
4444
- FirebaseCore (~> 10.0)
4545
- FirebaseCoreInternal (10.29.0):
4646
- "GoogleUtilities/NSData+zlib (~> 7.8)"
@@ -49,37 +49,37 @@ PODS:
4949
- GoogleUtilities/Environment (~> 7.8)
5050
- GoogleUtilities/UserDefaults (~> 7.8)
5151
- PromisesObjC (~> 2.1)
52-
- FirebaseMessaging (10.20.0):
52+
- FirebaseMessaging (10.24.0):
5353
- FirebaseCore (~> 10.0)
5454
- FirebaseInstallations (~> 10.0)
5555
- GoogleDataTransport (~> 9.3)
5656
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
5757
- GoogleUtilities/Environment (~> 7.8)
5858
- GoogleUtilities/Reachability (~> 7.8)
5959
- GoogleUtilities/UserDefaults (~> 7.8)
60-
- nanopb (< 2.30910.0, >= 2.30908.0)
60+
- nanopb (< 2.30911.0, >= 2.30908.0)
6161
- fmt (9.1.0)
6262
- glog (0.3.5)
63-
- GoogleAppMeasurement (10.20.0):
64-
- GoogleAppMeasurement/AdIdSupport (= 10.20.0)
63+
- GoogleAppMeasurement (10.24.0):
64+
- GoogleAppMeasurement/AdIdSupport (= 10.24.0)
6565
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
6666
- GoogleUtilities/MethodSwizzler (~> 7.11)
6767
- GoogleUtilities/Network (~> 7.11)
6868
- "GoogleUtilities/NSData+zlib (~> 7.11)"
69-
- nanopb (< 2.30910.0, >= 2.30908.0)
70-
- GoogleAppMeasurement/AdIdSupport (10.20.0):
71-
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.20.0)
69+
- nanopb (< 2.30911.0, >= 2.30908.0)
70+
- GoogleAppMeasurement/AdIdSupport (10.24.0):
71+
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.24.0)
7272
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
7373
- GoogleUtilities/MethodSwizzler (~> 7.11)
7474
- GoogleUtilities/Network (~> 7.11)
7575
- "GoogleUtilities/NSData+zlib (~> 7.11)"
76-
- nanopb (< 2.30910.0, >= 2.30908.0)
77-
- GoogleAppMeasurement/WithoutAdIdSupport (10.20.0):
76+
- nanopb (< 2.30911.0, >= 2.30908.0)
77+
- GoogleAppMeasurement/WithoutAdIdSupport (10.24.0):
7878
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
7979
- GoogleUtilities/MethodSwizzler (~> 7.11)
8080
- GoogleUtilities/Network (~> 7.11)
8181
- "GoogleUtilities/NSData+zlib (~> 7.11)"
82-
- nanopb (< 2.30910.0, >= 2.30908.0)
82+
- nanopb (< 2.30911.0, >= 2.30908.0)
8383
- GoogleDataTransport (9.4.1):
8484
- GoogleUtilities/Environment (~> 7.7)
8585
- nanopb (< 2.30911.0, >= 2.30908.0)
@@ -159,11 +159,11 @@ PODS:
159159
- ReactCommon/turbomodule/bridging
160160
- ReactCommon/turbomodule/core
161161
- Yoga
162-
- nanopb (2.30909.1):
163-
- nanopb/decode (= 2.30909.1)
164-
- nanopb/encode (= 2.30909.1)
165-
- nanopb/decode (2.30909.1)
166-
- nanopb/encode (2.30909.1)
162+
- nanopb (2.30910.0):
163+
- nanopb/decode (= 2.30910.0)
164+
- nanopb/encode (= 2.30910.0)
165+
- nanopb/decode (2.30910.0)
166+
- nanopb/encode (2.30910.0)
167167
- NFCPassportReader (2.1.1):
168168
- OpenSSL-Universal (= 1.1.1900)
169169
- OpenSSL-Universal (1.1.1900)
@@ -1682,12 +1682,12 @@ PODS:
16821682
- React-Core
16831683
- RNDeviceInfo (14.0.4):
16841684
- React-Core
1685-
- RNFBApp (18.9.0):
1686-
- Firebase/CoreOnly (= 10.20.0)
1685+
- RNFBApp (19.3.0):
1686+
- Firebase/CoreOnly (= 10.24.0)
16871687
- React-Core
1688-
- RNFBMessaging (18.9.0):
1689-
- Firebase/Messaging (= 10.20.0)
1690-
- FirebaseCoreExtension (= 10.20.0)
1688+
- RNFBMessaging (19.3.0):
1689+
- Firebase/Messaging (= 10.24.0)
1690+
- FirebaseCoreExtension
16911691
- React-Core
16921692
- RNFBApp
16931693
- RNGestureHandler (2.24.0):
@@ -1788,9 +1788,9 @@ PODS:
17881788
- segment-analytics-react-native (2.20.3):
17891789
- React-Core
17901790
- sovran-react-native
1791-
- Sentry (8.49.2):
1792-
- Sentry/Core (= 8.49.2)
1793-
- Sentry/Core (8.49.2)
1791+
- Sentry (8.50.2):
1792+
- Sentry/Core (= 8.50.2)
1793+
- Sentry/Core (8.50.2)
17941794
- Sentry/HybridSDK (8.48.0)
17951795
- SentryPrivate (8.21.0)
17961796
- SocketRocket (0.7.0)
@@ -2114,24 +2114,24 @@ SPEC CHECKSUMS:
21142114
boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
21152115
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
21162116
FBLazyVector: 430e10366de01d1e3d57374500b1b150fe482e6d
2117-
Firebase: 10c8cb12fb7ad2ae0c09ffc86cd9c1ab392a0031
2118-
FirebaseAnalytics: a2731bf3670747ce8f65368b118d18aa8e368246
2119-
FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6
2120-
FirebaseCoreExtension: 0659f035b88c5a7a15a9763c48c2e6ca8c0a2977
2117+
Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
2118+
FirebaseAnalytics: b5efc493eb0f40ec560b04a472e3e1a15d39ca13
2119+
FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
2120+
FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
21212121
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
21222122
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
2123-
FirebaseMessaging: 06c414a21b122396a26847c523d5c370f8325df5
2123+
FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
21242124
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
21252125
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
2126-
GoogleAppMeasurement: bb3c564c3efb933136af0e94899e0a46167466a8
2126+
GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
21272127
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
21282128
GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
21292129
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
21302130
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
21312131
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
21322132
lottie-ios: a881093fab623c467d3bce374367755c272bdd59
21332133
lottie-react-native: 3ffec00c889acded6057766c99adf8eaced7790c
2134-
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
2134+
nanopb: 438bc412db1928dac798aa6fd75726007be04262
21352135
NFCPassportReader: e931c61c189e08a4b4afa0ed4014af19eab2f129
21362136
OpenSSL-Universal: 84efb8a29841f2764ac5403e0c4119a28b713346
21372137
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
@@ -2202,8 +2202,8 @@ SPEC CHECKSUMS:
22022202
RNCAsyncStorage: af7b591318005069c3795076addc83a4dd5c0a2e
22032203
RNCClipboard: 4abb037e8fe3b98a952564c9e0474f91c492df6d
22042204
RNDeviceInfo: d863506092aef7e7af3a1c350c913d867d795047
2205-
RNFBApp: 20bfba7e2a61a959518c1d57e5d48817c62ed3f6
2206-
RNFBMessaging: 48579eec1f6ffaed4038b67426d7076963ab9401
2205+
RNFBApp: 4097f75673f8b42a7cd1ba17e6ea85a94b45e4d1
2206+
RNFBMessaging: 92325b0d5619ac90ef023a23cfd16fd3b91d0a88
22072207
RNGestureHandler: 9c3877d98d4584891b69d16ebca855ac46507f4d
22082208
RNGoogleSignin: b8760528f2a7cbe157ecfdcc13bdb7d2745c9389
22092209
RNKeychain: bbe2f6d5cc008920324acb49ef86ccc03d3b38e4
@@ -2221,6 +2221,6 @@ SPEC CHECKSUMS:
22212221
SwiftyTesseract: 1f3d96668ae92dc2208d9842c8a59bea9fad2cbb
22222222
Yoga: b05994d1933f507b0a28ceaa4fdb968dc18da178
22232223

2224-
PODFILE CHECKSUM: 92a3feee42b02b97fbe3c56db97e6a79cc92f2c1
2224+
PODFILE CHECKSUM: 4c1f9edcbeb4d0ce27f59c7f64ba1f803e06511d
22252225

22262226
COCOAPODS: 1.16.2

‎app/ios/Self.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
CODE_SIGN_ENTITLEMENTS = OpenPassport/OpenPassportDebug.entitlements;
512512
CODE_SIGN_IDENTITY = "Apple Development";
513513
CODE_SIGN_STYLE = Automatic;
514-
CURRENT_PROJECT_VERSION = 119;
514+
CURRENT_PROJECT_VERSION = 122;
515515
DEBUG_INFORMATION_FORMAT = dwarf;
516516
DEVELOPMENT_TEAM = 5B29R5LYHQ;
517517
ENABLE_BITCODE = NO;
@@ -649,7 +649,7 @@
649649
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
650650
CLANG_ENABLE_MODULES = YES;
651651
CODE_SIGN_ENTITLEMENTS = OpenPassport/OpenPassport.entitlements;
652-
CURRENT_PROJECT_VERSION = 119;
652+
CURRENT_PROJECT_VERSION = 122;
653653
DEBUG_INFORMATION_FORMAT = dwarf;
654654
DEVELOPMENT_TEAM = 5B29R5LYHQ;
655655
FRAMEWORK_SEARCH_PATHS = (

‎app/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"@react-native-async-storage/async-storage": "^2.1.1",
5151
"@react-native-clipboard/clipboard": "1.13.2",
5252
"@react-native-community/netinfo": "^11.4.1",
53-
"@react-native-firebase/app": "^18.7.3",
54-
"@react-native-firebase/messaging": "^18.7.3",
53+
"@react-native-firebase/app": "^19.0.1",
54+
"@react-native-firebase/messaging": "^19.0.1",
5555
"@react-native-google-signin/google-signin": "^13.1.0",
5656
"@react-navigation/native": "^7.0.14",
5757
"@react-navigation/native-stack": "^7.2.0",

‎app/src/screens/misc/LoadingScreen.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import {
1818
getStateMessage,
1919
setupNotifications,
2020
} from '../../utils/notifications/notificationService';
21+
import { getLoadingScreenText } from '../../utils/proving/loadingScreenStateText';
2122
import {
2223
ProvingStateType,
2324
useProvingStore,
2425
} from '../../utils/proving/provingMachine';
25-
import { getLoadingScreenText } from '../../utils/proving/stateLoadingScreenText';
2626

2727
type LoadingScreenProps = StaticScreenProps<{}>;
2828

‎app/src/utils/proving/stateLoadingScreenText.ts‎ renamed to ‎app/src/utils/proving/loadingScreenStateText.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,24 @@ export function getProvingTimeEstimate(
1616
): string {
1717
if (!metadata) return '30 - 90 SECONDS';
1818

19-
const algorithm = metadata.signatureAlgorithm;
19+
const algorithm = metadata.signatureAlgorithm?.toLowerCase();
2020
const curveOrExponent = metadata.curveOrExponent;
2121

2222
// RSA algorithms
23-
if (algorithm?.toLowerCase().includes('rsa')) {
24-
if (algorithm?.toLowerCase().includes('pss')) {
23+
if (algorithm?.includes('rsa')) {
24+
if (algorithm?.includes('pss')) {
2525
return type === 'dsc' ? '3 SECONDS' : '6 SECONDS';
2626
}
2727
return type === 'dsc' ? '2 SECONDS' : '4 SECONDS';
2828
}
2929

3030
// ECDSA algorithms
31-
if (algorithm?.toLowerCase().includes('ecdsa')) {
31+
if (algorithm?.includes('ecdsa')) {
3232
// Check bit size from curve name
33-
if (
34-
curveOrExponent?.toLowerCase().includes('224') ||
35-
curveOrExponent?.toLowerCase().includes('256')
36-
) {
33+
if (curveOrExponent?.includes('224') || curveOrExponent?.includes('256')) {
3734
return type === 'dsc' ? '25 SECONDS' : '50 SECONDS';
3835
}
39-
if (curveOrExponent?.toLowerCase().includes('384')) {
36+
if (curveOrExponent?.includes('384')) {
4037
return type === 'dsc' ? '45 SECONDS' : '90 SECONDS';
4138
}
4239
if (curveOrExponent?.includes('512') || curveOrExponent?.includes('521')) {

‎app/tests/utils/proving/stateLoadingScreenText.test.ts‎ renamed to ‎app/tests/utils/proving/loadingScreenStateText.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { ProvingStateType } from '../../../src/utils/proving/provingMachine';
21
import {
32
getLoadingScreenText,
43
getProvingTimeEstimate,
54
PassportMetadata,
6-
} from '../../../src/utils/proving/stateLoadingScreenText';
5+
} from '../../../src/utils/proving/loadingScreenStateText';
6+
import { ProvingStateType } from '../../../src/utils/proving/provingMachine';
77

88
describe('stateLoadingScreenText', () => {
99
// Default metadata for basic tests

0 commit comments

Comments
 (0)