Skip to content

Commit 5ff769e

Browse files
committed
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into Integrate-Seed-Verification-Flow-To-Integration-Tests
2 parents 629cdf0 + 10294e0 commit 5ff769e

File tree

112 files changed

+4944
-1789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4944
-1789
lines changed

android/app/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ android {
4242
disable 'InvalidPackage'
4343
}
4444

45+
compileOptions {
46+
coreLibraryDesugaringEnabled true
47+
48+
sourceCompatibility JavaVersion.VERSION_17
49+
targetCompatibility JavaVersion.VERSION_17
50+
}
51+
52+
4553
namespace "com.cakewallet.cake_wallet"
4654

4755
defaultConfig {
@@ -73,7 +81,6 @@ android {
7381
buildTypes {
7482
release {
7583
signingConfig signingConfigs.release
76-
7784
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
7885
}
7986
debug {
@@ -92,6 +99,7 @@ dependencies {
9299
testImplementation 'junit:junit:4.12'
93100
androidTestImplementation 'androidx.test:runner:1.3.0'
94101
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
102+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
95103
}
96104
configurations {
97105
implementation.exclude module:'proto-google-common-protos'

android/app/proguard-rules.pro

Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,97 @@
66
-keep class io.flutter.** { *; }
77
-keep class io.flutter.plugins.** { *; }
88
-dontwarn io.flutter.embedding.**
9-
-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
9+
-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
10+
11+
# start reown
12+
-dontwarn com.github.luben.zstd.BufferPool
13+
-dontwarn com.github.luben.zstd.ZstdInputStream
14+
-dontwarn com.github.luben.zstd.ZstdOutputStream
15+
-dontwarn com.google.api.client.http.GenericUrl
16+
-dontwarn com.google.api.client.http.HttpHeaders
17+
-dontwarn com.google.api.client.http.HttpRequest
18+
-dontwarn com.google.api.client.http.HttpRequestFactory
19+
-dontwarn com.google.api.client.http.HttpResponse
20+
-dontwarn com.google.api.client.http.HttpTransport
21+
-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
22+
-dontwarn com.google.api.client.http.javanet.NetHttpTransport
23+
-dontwarn java.awt.Color
24+
-dontwarn java.awt.Dimension
25+
-dontwarn java.awt.Graphics2D
26+
-dontwarn java.awt.Graphics
27+
-dontwarn java.awt.Image
28+
-dontwarn java.awt.Point
29+
-dontwarn java.awt.Polygon
30+
-dontwarn java.awt.Shape
31+
-dontwarn java.awt.color.ColorSpace
32+
-dontwarn java.awt.geom.AffineTransform
33+
-dontwarn java.awt.image.BufferedImage
34+
-dontwarn java.awt.image.ColorModel
35+
-dontwarn java.awt.image.ComponentColorModel
36+
-dontwarn java.awt.image.ComponentSampleModel
37+
-dontwarn java.awt.image.DataBuffer
38+
-dontwarn java.awt.image.DataBufferByte
39+
-dontwarn java.awt.image.DataBufferInt
40+
-dontwarn java.awt.image.DataBufferUShort
41+
-dontwarn java.awt.image.ImageObserver
42+
-dontwarn java.awt.image.MultiPixelPackedSampleModel
43+
-dontwarn java.awt.image.Raster
44+
-dontwarn java.awt.image.RenderedImage
45+
-dontwarn java.awt.image.SampleModel
46+
-dontwarn java.awt.image.SinglePixelPackedSampleModel
47+
-dontwarn java.awt.image.WritableRaster
48+
-dontwarn java.beans.BeanInfo
49+
-dontwarn java.beans.FeatureDescriptor
50+
-dontwarn java.beans.IntrospectionException
51+
-dontwarn java.beans.Introspector
52+
-dontwarn java.beans.PropertyDescriptor
53+
-dontwarn java.lang.reflect.InaccessibleObjectException
54+
-dontwarn javax.imageio.IIOImage
55+
-dontwarn javax.imageio.ImageIO
56+
-dontwarn javax.imageio.ImageWriteParam
57+
-dontwarn javax.imageio.ImageWriter
58+
-dontwarn javax.imageio.metadata.IIOMetadata
59+
-dontwarn javax.imageio.stream.ImageOutputStream
60+
-dontwarn javax.swing.JComponent
61+
-dontwarn javax.swing.JFileChooser
62+
-dontwarn javax.swing.JFrame
63+
-dontwarn javax.swing.JPanel
64+
-dontwarn javax.swing.ProgressMonitor
65+
-dontwarn javax.swing.SwingUtilities
66+
-dontwarn org.brotli.dec.BrotliInputStream
67+
-dontwarn org.joda.time.Instant
68+
-dontwarn org.objectweb.asm.AnnotationVisitor
69+
-dontwarn org.objectweb.asm.Attribute
70+
-dontwarn org.objectweb.asm.ClassReader
71+
-dontwarn org.objectweb.asm.ClassVisitor
72+
-dontwarn org.objectweb.asm.FieldVisitor
73+
-dontwarn org.objectweb.asm.Label
74+
-dontwarn org.objectweb.asm.MethodVisitor
75+
-dontwarn org.objectweb.asm.Type
76+
-dontwarn org.tukaani.xz.ARMOptions
77+
-dontwarn org.tukaani.xz.ARMThumbOptions
78+
-dontwarn org.tukaani.xz.DeltaOptions
79+
-dontwarn org.tukaani.xz.FilterOptions
80+
-dontwarn org.tukaani.xz.FinishableOutputStream
81+
-dontwarn org.tukaani.xz.FinishableWrapperOutputStream
82+
-dontwarn org.tukaani.xz.IA64Options
83+
-dontwarn org.tukaani.xz.LZMA2InputStream
84+
-dontwarn org.tukaani.xz.LZMA2Options
85+
-dontwarn org.tukaani.xz.LZMAInputStream
86+
-dontwarn org.tukaani.xz.LZMAOutputStream
87+
-dontwarn org.tukaani.xz.MemoryLimitException
88+
-dontwarn org.tukaani.xz.PowerPCOptions
89+
-dontwarn org.tukaani.xz.SPARCOptions
90+
-dontwarn org.tukaani.xz.SingleXZInputStream
91+
-dontwarn org.tukaani.xz.UnsupportedOptionsException
92+
-dontwarn org.tukaani.xz.X86Options
93+
-dontwarn org.tukaani.xz.XZ
94+
-dontwarn org.tukaani.xz.XZInputStream
95+
-dontwarn org.tukaani.xz.XZOutputStream
96+
-dontwarn us.hebi.matlab.mat.ejml.Mat5Ejml
97+
-dontwarn us.hebi.matlab.mat.format.Mat5
98+
-dontwarn us.hebi.matlab.mat.format.Mat5File
99+
-dontwarn us.hebi.matlab.mat.types.Array
100+
-dontwarn us.hebi.matlab.mat.types.MatFile$Entry
101+
-dontwarn us.hebi.matlab.mat.types.MatFile
102+
# end reown

android/app/src/main/AndroidManifestBase.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
2525
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
2626

27+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
28+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
29+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
30+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
2731

2832
<application
2933
android:name=".Application"
@@ -35,6 +39,10 @@
3539
android:versionName="__versionName__"
3640
android:requestLegacyExternalStorage="true"
3741
android:extractNativeLibs="true">
42+
<service
43+
android:name="androidx.work.impl.foreground.SystemForegroundService"
44+
android:foregroundServiceType="dataSync"
45+
android:exported="false" />
3846
<activity
3947
android:name=".MainActivity"
4048
android:launchMode="singleInstance"

android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ allprojects {
22
repositories {
33
google()
44
mavenCentral()
5+
maven { url "https://jitpack.io" }
56
}
67
}
78

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
Monero 12-word seed support (Wallet Groups support as well)
2-
Integrate DFX's OpenCryptoPay
3-
Exchange flow enhancements
4-
Hardware Wallets flow enhancements
5-
Minor UI enhancements
1+
Background sync improvements
2+
Payment notifications
3+
UI/UX improvements
64
Bug fixes

assets/text/Release_Notes.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
Monero 12-word seed support (Wallet Groups support as well)
2-
Integrate DFX's OpenCryptoPay
3-
Exchange flow enhancements
4-
Hardware Wallets flow enhancements
5-
Minor UI enhancements
1+
Background sync improvements
2+
Payment notifications
3+
WalletConnect enhancements
4+
UI/UX improvements
65
Bug fixes

cw_monero/lib/monero_wallet.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
256256
Future<void> stopSync() async {
257257
if (isBackgroundSyncRunning) {
258258
printV("Stopping background sync");
259-
await save();
259+
monero.Wallet_store(wptr!);
260260
monero.Wallet_stopBackgroundSync(wptr!, '');
261+
monero_wallet.store();
261262
isBackgroundSyncRunning = false;
262263
}
263264
await save();
@@ -268,9 +269,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
268269
Future<void> stopBackgroundSync(String password) async {
269270
if (isBackgroundSyncRunning) {
270271
printV("Stopping background sync");
271-
await save();
272+
monero.Wallet_store(wptr!);
272273
monero.Wallet_stopBackgroundSync(wptr!, password);
273-
await save();
274+
monero.Wallet_store(wptr!);
274275
isBackgroundSyncRunning = false;
275276
}
276277
}

cw_shared_external/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.3.0'
12+
classpath 'com.android.tools.build:gradle:8.7.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}

cw_solana/lib/solana_client.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@ class SolanaWalletClient {
890890
}) async {
891891
/// Sign the transaction with the owner's private key.
892892
final ownerSignature = ownerPrivateKey.sign(transaction.serializeMessage());
893+
893894
transaction.addSignature(ownerPrivateKey.publicKey().toAddress(), ownerSignature);
894895

895896
/// Serialize the transaction.

ios/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '12.0'
2+
platform :ios, '13.0'
33
source 'https://github.com/CocoaPods/Specs.git'
44

55
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
@@ -43,7 +43,7 @@ post_install do |installer|
4343
flutter_additional_ios_build_settings(target)
4444

4545
target.build_configurations.each do |config|
46-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
46+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
4747
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
4848
'$(inherited)',
4949

0 commit comments

Comments
 (0)