Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI #612

Merged
merged 7 commits into from
Oct 16, 2023
Merged

Fix CI #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
918431f
Fix CI
vbabenkoru Aug 1, 2023
45a22b8
Merge branch 'encryption' into wip/fix-ci
Oct 5, 2023
1f69aab
Master key creation in protected block
Oct 9, 2023
13ccae4
Adding androidx security overrides in the app
Oct 10, 2023
e196b41
Security override on api-ui
Oct 10, 2023
a117cae
Checking if compileOption was needed
Oct 12, 2023
06d283e
Revert "Checking if compileOption was needed"
Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:tools="http://schemas.android.com/tools" package="iterable.com.iterableapi">
<uses-sdk tools:overrideLibrary="br.com.concretesolutions.kappuccino,android_libs.ub_uiautomator"/>
<uses-sdk tools:overrideLibrary="br.com.concretesolutions.kappuccino,android_libs.ub_uiautomator,androidx.security"/>
</manifest>
5 changes: 4 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.iterable.iterableapi.testapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.iterable.iterableapi.testapp">
<uses-sdk tools:overrideLibrary="androidx.security"/>
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand Down
2 changes: 2 additions & 0 deletions iterableapi-ui/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.iterable.iterableapi.ui">
<uses-sdk tools:overrideLibrary="androidx.security"/>
<application>
<activity
android:name=".inbox.IterableInboxActivity"
Expand Down
5 changes: 5 additions & 0 deletions iterableapi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ android {
compileSdkVersion 29
buildToolsVersion '29.0.3'

compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 27
Expand Down
2 changes: 1 addition & 1 deletion iterableapi/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="iterable.com.iterableapi">
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator"/>
<uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator,androidx.security"/>
<application
android:label="IterableAPI"
android:supportsRtl="true" />
Expand Down
6 changes: 3 additions & 3 deletions iterableapi/src/main/java/com/iterable/iterableapi/IterableKeychain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ class IterableKeychain {
IterableLogger.v(TAG, "SharedPreferences being used")
} else {
// See if EncryptedSharedPreferences can be created successfully
val masterKeyAlias = MasterKey.Builder(context)
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
.build()
try {
val masterKeyAlias = MasterKey.Builder(context)
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
.build()
sharedPrefs = EncryptedSharedPreferences.create(
context,
encryptedSharedPrefsFileName,
Expand Down
3 changes: 2 additions & 1 deletion iterableapi/src/test/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.iterable.iterableapi" android:versionName="1.2.3" android:versionCode="321">
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="com.iterable.iterableapi" android:versionName="1.2.3" android:versionCode="321">
<uses-sdk tools:overrideLibrary="androidx.security"/>
<application
android:label="IterableAPI"
android:supportsRtl="true">
Expand Down
Loading