Skip to content

Commit aaaa3a9

Browse files
StjinStjin
authored
Merge pull request #14 from anonaddy/1.1.4
1.1.4
2 parents 5a06792 + 5446e85 commit aaaa3a9

File tree

7 files changed

+45
-34
lines changed

7 files changed

+45
-34
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [v1.1.4] - 2024-11-17
4+
5+
### addy.io
6+
7+
**Fixed/Improved**
8+
- Fixed the API Key not being recognized in the setup
9+
310
## [v1.1.3] - 2024-11-12
411

512
### addy.io

‎addy.xcodeproj/project.pbxproj

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@
17651765
CODE_SIGN_ENTITLEMENTS = addy/addy.debug.entitlements;
17661766
CODE_SIGN_IDENTITY = "Apple Development";
17671767
CODE_SIGN_STYLE = Automatic;
1768-
CURRENT_PROJECT_VERSION = 18;
1768+
CURRENT_PROJECT_VERSION = 19;
17691769
DEVELOPMENT_ASSET_PATHS = "\"addy/Preview Content\"";
17701770
DEVELOPMENT_TEAM = 83RFSJ6CUP;
17711771
ENABLE_PREVIEWS = YES;
@@ -1785,7 +1785,7 @@
17851785
"$(inherited)",
17861786
"@executable_path/Frameworks",
17871787
);
1788-
MARKETING_VERSION = 1.1.3;
1788+
MARKETING_VERSION = 1.1.4;
17891789
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.debug;
17901790
PRODUCT_NAME = "$(TARGET_NAME)";
17911791
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1805,7 +1805,7 @@
18051805
CODE_SIGN_ENTITLEMENTS = AddyStatisticWidgetExtension.debug.entitlements;
18061806
CODE_SIGN_IDENTITY = "Apple Development";
18071807
CODE_SIGN_STYLE = Automatic;
1808-
CURRENT_PROJECT_VERSION = 18;
1808+
CURRENT_PROJECT_VERSION = 19;
18091809
DEVELOPMENT_TEAM = 83RFSJ6CUP;
18101810
ENABLE_USER_SCRIPT_SANDBOXING = YES;
18111811
GENERATE_INFOPLIST_FILE = YES;
@@ -1819,7 +1819,7 @@
18191819
"@executable_path/Frameworks",
18201820
"@executable_path/../../Frameworks",
18211821
);
1822-
MARKETING_VERSION = 1.1.3;
1822+
MARKETING_VERSION = 1.1.4;
18231823
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.debug.AddyStatisticWidget;
18241824
PRODUCT_NAME = "$(TARGET_NAME)";
18251825
SKIP_INSTALL = YES;
@@ -1836,7 +1836,7 @@
18361836
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.debug.entitlements;
18371837
CODE_SIGN_IDENTITY = "Apple Development";
18381838
CODE_SIGN_STYLE = Automatic;
1839-
CURRENT_PROJECT_VERSION = 18;
1839+
CURRENT_PROJECT_VERSION = 19;
18401840
DEVELOPMENT_TEAM = 83RFSJ6CUP;
18411841
ENABLE_USER_SCRIPT_SANDBOXING = YES;
18421842
GENERATE_INFOPLIST_FILE = YES;
@@ -1850,7 +1850,7 @@
18501850
"@executable_path/Frameworks",
18511851
"@executable_path/../../Frameworks",
18521852
);
1853-
MARKETING_VERSION = 1.1.3;
1853+
MARKETING_VERSION = 1.1.4;
18541854
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.debug.AddyShareExtension;
18551855
PRODUCT_NAME = "$(TARGET_NAME)";
18561856
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1946,7 +1946,7 @@
19461946
CODE_SIGN_ENTITLEMENTS = addy/addy.entitlements;
19471947
CODE_SIGN_IDENTITY = "Apple Development";
19481948
CODE_SIGN_STYLE = Automatic;
1949-
CURRENT_PROJECT_VERSION = 18;
1949+
CURRENT_PROJECT_VERSION = 19;
19501950
DEVELOPMENT_ASSET_PATHS = "\"addy/Preview Content\"";
19511951
DEVELOPMENT_TEAM = 83RFSJ6CUP;
19521952
ENABLE_PREVIEWS = YES;
@@ -1966,7 +1966,7 @@
19661966
"$(inherited)",
19671967
"@executable_path/Frameworks",
19681968
);
1969-
MARKETING_VERSION = 1.1.3;
1969+
MARKETING_VERSION = 1.1.4;
19701970
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy;
19711971
PRODUCT_NAME = "$(TARGET_NAME)";
19721972
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1986,7 +1986,7 @@
19861986
CODE_SIGN_ENTITLEMENTS = AddyStatisticWidgetExtension.entitlements;
19871987
CODE_SIGN_IDENTITY = "Apple Development";
19881988
CODE_SIGN_STYLE = Automatic;
1989-
CURRENT_PROJECT_VERSION = 18;
1989+
CURRENT_PROJECT_VERSION = 19;
19901990
DEVELOPMENT_TEAM = 83RFSJ6CUP;
19911991
ENABLE_USER_SCRIPT_SANDBOXING = YES;
19921992
GENERATE_INFOPLIST_FILE = YES;
@@ -2000,7 +2000,7 @@
20002000
"@executable_path/Frameworks",
20012001
"@executable_path/../../Frameworks",
20022002
);
2003-
MARKETING_VERSION = 1.1.3;
2003+
MARKETING_VERSION = 1.1.4;
20042004
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.AddyStatisticWidget;
20052005
PRODUCT_NAME = "$(TARGET_NAME)";
20062006
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2018,7 +2018,7 @@
20182018
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
20192019
CODE_SIGN_IDENTITY = "Apple Development";
20202020
CODE_SIGN_STYLE = Automatic;
2021-
CURRENT_PROJECT_VERSION = 18;
2021+
CURRENT_PROJECT_VERSION = 19;
20222022
DEVELOPMENT_TEAM = 83RFSJ6CUP;
20232023
ENABLE_USER_SCRIPT_SANDBOXING = YES;
20242024
GENERATE_INFOPLIST_FILE = YES;
@@ -2032,7 +2032,7 @@
20322032
"@executable_path/Frameworks",
20332033
"@executable_path/../../Frameworks",
20342034
);
2035-
MARKETING_VERSION = 1.1.3;
2035+
MARKETING_VERSION = 1.1.4;
20362036
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.AddyShareExtension;
20372037
PRODUCT_NAME = "$(TARGET_NAME)";
20382038
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2068,7 +2068,7 @@
20682068
CODE_SIGN_ENTITLEMENTS = AddyStatisticWidgetExtension.debug.entitlements;
20692069
CODE_SIGN_IDENTITY = "Apple Development";
20702070
CODE_SIGN_STYLE = Automatic;
2071-
CURRENT_PROJECT_VERSION = 18;
2071+
CURRENT_PROJECT_VERSION = 19;
20722072
DEVELOPMENT_TEAM = 83RFSJ6CUP;
20732073
ENABLE_USER_SCRIPT_SANDBOXING = YES;
20742074
GENERATE_INFOPLIST_FILE = YES;
@@ -2082,7 +2082,7 @@
20822082
"@executable_path/Frameworks",
20832083
"@executable_path/../../Frameworks",
20842084
);
2085-
MARKETING_VERSION = 1.1.3;
2085+
MARKETING_VERSION = 1.1.4;
20862086
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.debug.AddyStatisticWidget;
20872087
PRODUCT_NAME = "$(TARGET_NAME)";
20882088
SKIP_INSTALL = YES;
@@ -2101,7 +2101,7 @@
21012101
CODE_SIGN_ENTITLEMENTS = AddyStatisticWidgetExtension.entitlements;
21022102
CODE_SIGN_IDENTITY = "Apple Development";
21032103
CODE_SIGN_STYLE = Automatic;
2104-
CURRENT_PROJECT_VERSION = 18;
2104+
CURRENT_PROJECT_VERSION = 19;
21052105
DEVELOPMENT_TEAM = 83RFSJ6CUP;
21062106
ENABLE_USER_SCRIPT_SANDBOXING = YES;
21072107
GENERATE_INFOPLIST_FILE = YES;
@@ -2115,7 +2115,7 @@
21152115
"@executable_path/Frameworks",
21162116
"@executable_path/../../Frameworks",
21172117
);
2118-
MARKETING_VERSION = 1.1.3;
2118+
MARKETING_VERSION = 1.1.4;
21192119
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.AddyStatisticWidget;
21202120
PRODUCT_NAME = "$(TARGET_NAME)";
21212121
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2133,7 +2133,7 @@
21332133
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.debug.entitlements;
21342134
CODE_SIGN_IDENTITY = "Apple Development";
21352135
CODE_SIGN_STYLE = Automatic;
2136-
CURRENT_PROJECT_VERSION = 18;
2136+
CURRENT_PROJECT_VERSION = 19;
21372137
DEVELOPMENT_TEAM = 83RFSJ6CUP;
21382138
ENABLE_USER_SCRIPT_SANDBOXING = YES;
21392139
GENERATE_INFOPLIST_FILE = YES;
@@ -2147,7 +2147,7 @@
21472147
"@executable_path/Frameworks",
21482148
"@executable_path/../../Frameworks",
21492149
);
2150-
MARKETING_VERSION = 1.1.3;
2150+
MARKETING_VERSION = 1.1.4;
21512151
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.debug.AddyShareExtension;
21522152
PRODUCT_NAME = "$(TARGET_NAME)";
21532153
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2165,7 +2165,7 @@
21652165
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
21662166
CODE_SIGN_IDENTITY = "Apple Development";
21672167
CODE_SIGN_STYLE = Automatic;
2168-
CURRENT_PROJECT_VERSION = 18;
2168+
CURRENT_PROJECT_VERSION = 19;
21692169
DEVELOPMENT_TEAM = 83RFSJ6CUP;
21702170
ENABLE_USER_SCRIPT_SANDBOXING = YES;
21712171
GENERATE_INFOPLIST_FILE = YES;
@@ -2179,7 +2179,7 @@
21792179
"@executable_path/Frameworks",
21802180
"@executable_path/../../Frameworks",
21812181
);
2182-
MARKETING_VERSION = 1.1.3;
2182+
MARKETING_VERSION = 1.1.4;
21832183
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.AddyShareExtension;
21842184
PRODUCT_NAME = "$(TARGET_NAME)";
21852185
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2325,7 +2325,7 @@
23252325
CODE_SIGN_ENTITLEMENTS = addy/addy.debug.entitlements;
23262326
CODE_SIGN_IDENTITY = "Apple Development";
23272327
CODE_SIGN_STYLE = Automatic;
2328-
CURRENT_PROJECT_VERSION = 18;
2328+
CURRENT_PROJECT_VERSION = 19;
23292329
DEVELOPMENT_ASSET_PATHS = "\"addy/Preview Content\"";
23302330
DEVELOPMENT_TEAM = 83RFSJ6CUP;
23312331
ENABLE_PREVIEWS = YES;
@@ -2345,7 +2345,7 @@
23452345
"$(inherited)",
23462346
"@executable_path/Frameworks",
23472347
);
2348-
MARKETING_VERSION = 1.1.3;
2348+
MARKETING_VERSION = 1.1.4;
23492349
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy.debug;
23502350
PRODUCT_NAME = "$(TARGET_NAME)";
23512351
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2366,7 +2366,7 @@
23662366
CODE_SIGN_ENTITLEMENTS = addy/addy.entitlements;
23672367
CODE_SIGN_IDENTITY = "Apple Development";
23682368
CODE_SIGN_STYLE = Automatic;
2369-
CURRENT_PROJECT_VERSION = 18;
2369+
CURRENT_PROJECT_VERSION = 19;
23702370
DEVELOPMENT_ASSET_PATHS = "\"addy/Preview Content\"";
23712371
DEVELOPMENT_TEAM = 83RFSJ6CUP;
23722372
ENABLE_PREVIEWS = YES;
@@ -2386,7 +2386,7 @@
23862386
"$(inherited)",
23872387
"@executable_path/Frameworks",
23882388
);
2389-
MARKETING_VERSION = 1.1.3;
2389+
MARKETING_VERSION = 1.1.4;
23902390
PRODUCT_BUNDLE_IDENTIFIER = host.stjin.addy;
23912391
PRODUCT_NAME = "$(TARGET_NAME)";
23922392
PROVISIONING_PROFILE_SPECIFIER = "";

‎addy.xcodeproj/project.xcworkspace/xcuserdata/stjin.xcuserdatad/UserInterfaceState.xcuserstate

15.6 KB
Binary file not shown.

‎addy.xcodeproj/xcuserdata/stjin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5644,8 +5644,8 @@
56445644
filePath = "addy/View/setup/AddApiBottomSheet.swift"
56455645
startingColumnNumber = "9223372036854775807"
56465646
endingColumnNumber = "9223372036854775807"
5647-
startingLineNumber = "297"
5648-
endingLineNumber = "297"
5647+
startingLineNumber = "301"
5648+
endingLineNumber = "301"
56495649
landmarkName = "verifyLogin(username:password:otp:baseUrl:)"
56505650
landmarkType = "7">
56515651
</BreakpointContent>
@@ -5660,8 +5660,8 @@
56605660
filePath = "addy/View/setup/AddApiBottomSheet.swift"
56615661
startingColumnNumber = "9223372036854775807"
56625662
endingColumnNumber = "9223372036854775807"
5663-
startingLineNumber = "299"
5664-
endingLineNumber = "299"
5663+
startingLineNumber = "303"
5664+
endingLineNumber = "303"
56655665
landmarkName = "verifyLogin(username:password:otp:baseUrl:)"
56665666
landmarkType = "7">
56675667
</BreakpointContent>
@@ -5804,8 +5804,8 @@
58045804
filePath = "addy/View/setup/AddApiBottomSheet.swift"
58055805
startingColumnNumber = "9223372036854775807"
58065806
endingColumnNumber = "9223372036854775807"
5807-
startingLineNumber = "314"
5808-
endingLineNumber = "314"
5807+
startingLineNumber = "318"
5808+
endingLineNumber = "318"
58095809
landmarkName = "verifyLogin(username:password:otp:baseUrl:)"
58105810
landmarkType = "7">
58115811
</BreakpointContent>
@@ -5820,8 +5820,8 @@
58205820
filePath = "addy/View/setup/AddApiBottomSheet.swift"
58215821
startingColumnNumber = "9223372036854775807"
58225822
endingColumnNumber = "9223372036854775807"
5823-
startingLineNumber = "313"
5824-
endingLineNumber = "313"
5823+
startingLineNumber = "317"
5824+
endingLineNumber = "317"
58255825
landmarkName = "verifyLogin(username:password:otp:baseUrl:)"
58265826
landmarkType = "7">
58275827
</BreakpointContent>

‎addy/Localizable.xcstrings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@
818818
"en" : {
819819
"stringUnit" : {
820820
"state" : "translated",
821-
"value" : "**What’s new in addy.io for iOS 1.1.3**\n\n**Fixed/Improved**\n- Fixed a crash when editing a rule containing a deleted recipient\n- Allow for refreshing every page in the app\n- Optimized refresh token flow by locking in the username\n- Check if a refreshed token belongs to the same account\n- A new option has been added allowing users to review the app directly from the settings menu"
821+
"value" : "**What’s new in addy.io for iOS 1.1.4**\n\n**Fixed/Improved**\n- Fixed the API Key not being recognized in the setup"
822822
}
823823
}
824824
}

‎addy/View/setup/AddApiBottomSheet.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,11 @@ struct AddApiBottomSheet: View {
256256
do {
257257
let result = try await networkHelper.verifyApiKey(baseUrl: baseUrl, apiKey: cleanApiKey)
258258
if result != nil {
259-
if mainViewState.userResource?.id == result?.id {
259+
// APIKey is verified if the API_KEY is currently nil (aka empty)
260+
// Or
261+
// UserResource ids are the same
262+
if SettingsManager(encrypted: true).getSettingsString(key: .apiKey) == nil ||
263+
mainViewState.userResource?.id == result?.id {
260264
self.addKey(cleanApiKey, baseUrl)
261265
} else {
262266
resetSignInButton()

‎builds/appstorelessRelease 2024-11-11 18-38-54/addy.ipa renamed to ‎builds/appstorelessRelease 2024-11-17 10-35-57/addy.ipa

19.9 MB
Binary file not shown.

0 commit comments

Comments
 (0)