From 5631961e478013b3f19892b8fff83e0f08bacdb4 Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Thu, 28 Jan 2021 19:58:17 +0200
Subject: [PATCH] Some another fixes for Android. Never ask us about that.

---
 android/app/src/main/AndroidManifest.xml | 12 +-----
 android/build.gradle                     |  2 +-
 cw_monero/android/build.gradle           |  2 +-
 cw_monero/ios/Classes/monero_api.cpp     |  2 +-
 lib/src/screens/backup/backup_page.dart  | 52 +++++++++++++++++++-----
 lib/view_model/backup_view_model.dart    | 10 +++++
 pubspec.yaml                             |  2 +-
 7 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4513c32f6..437729891 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,7 +3,8 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:label="Cake Wallet"
         android:allowBackup="false"
@@ -17,15 +18,6 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait">
-<!--            <meta-data-->
-<!--                    android:name="io.flutter.embedding.android.NormalTheme"-->
-<!--                    android:resource="@style/NormalTheme"-->
-<!--            />-->
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
             <meta-data
                     android:name="io.flutter.embedding.android.SplashScreenDrawable"
                     android:resource="@drawable/launch_background"
diff --git a/android/build.gradle b/android/build.gradle
index e0d7ae2c1..0baed694d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.4'
     }
 }
 
diff --git a/cw_monero/android/build.gradle b/cw_monero/android/build.gradle
index ed8c40213..4d5a6dc5c 100644
--- a/cw_monero/android/build.gradle
+++ b/cw_monero/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/cw_monero/ios/Classes/monero_api.cpp b/cw_monero/ios/Classes/monero_api.cpp
index efe8c49f1..d90b6fd7d 100644
--- a/cw_monero/ios/Classes/monero_api.cpp
+++ b/cw_monero/ios/Classes/monero_api.cpp
@@ -696,7 +696,7 @@ extern "C"
     void on_startup()
     {
         Monero::Utils::onStartup();
-        Monero::WalletManagerFactory::setLogLevel(4);
+        Monero::WalletManagerFactory::setLogLevel(0);
     }
 
     void rescan_blockchain()
diff --git a/lib/src/screens/backup/backup_page.dart b/lib/src/screens/backup/backup_page.dart
index f17bc5cff..5a22f6bf9 100644
--- a/lib/src/screens/backup/backup_page.dart
+++ b/lib/src/screens/backup/backup_page.dart
@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
@@ -91,17 +92,46 @@ class BackupPage extends BasePage {
         context: context,
         builder: (dialogContext) {
           return AlertWithTwoActions(
-            alertTitle: S.of(context).export_backup,
-            alertContent: S.of(context).save_backup_password,
-            rightButtonText: S.of(context).seed_alert_yes,
-            leftButtonText: S.of(context).seed_alert_back,
-            actionRightButton: () async {
-              Navigator.of(dialogContext).pop();
-              final backup = await backupViewModelBase.exportBackup();
-              await Share.file(
-                S.of(context).backup_file, backup.name, backup.content, 'text');
-            },
-            actionLeftButton: () => Navigator.of(dialogContext).pop());
+              alertTitle: S.of(context).export_backup,
+              alertContent: S.of(context).save_backup_password,
+              rightButtonText: S.of(context).seed_alert_yes,
+              leftButtonText: S.of(context).seed_alert_back,
+              actionRightButton: () async {
+                Navigator.of(dialogContext).pop();
+                final backup = await backupViewModelBase.exportBackup();
+                await backupViewModelBase.saveToDownload(
+                    backup.name, backup.content);
+
+                if (Platform.isAndroid) {
+                  onExportAndroid(context, backup);
+                } else {
+                  await Share.file(S.of(context).backup_file, backup.name,
+                      backup.content, 'application/*');
+                }
+              },
+              actionLeftButton: () => Navigator.of(dialogContext).pop());
+        });
+  }
+
+  void onExportAndroid(BuildContext context, BackupExportFile backup) {
+    showPopUp<void>(
+        context: context,
+        builder: (dialogContext) {
+          return AlertWithTwoActions(
+              alertTitle: S.of(context).export_backup,
+              alertContent: 'Please select destination for the backup file.',
+              rightButtonText: 'Save to Downloads',
+              leftButtonText: 'Share',
+              actionRightButton: () async {
+                Navigator.of(dialogContext).pop();
+                await backupViewModelBase.saveToDownload(
+                    backup.name, backup.content);
+              },
+              actionLeftButton: () {
+                Navigator.of(dialogContext).pop();
+                Share.file(S.of(context).backup_file, backup.name,
+                    backup.content, 'application/*');
+              });
         });
   }
 }
diff --git a/lib/view_model/backup_view_model.dart b/lib/view_model/backup_view_model.dart
index b76c19163..660c576c4 100644
--- a/lib/view_model/backup_view_model.dart
+++ b/lib/view_model/backup_view_model.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cake_wallet/core/backup_service.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/entities/secret_store_key.dart';
@@ -66,4 +68,12 @@ abstract class BackupViewModelBase with Store {
 
   @action
   void showMasterPassword() => isBackupPasswordVisible = true;
+
+  @action
+  Future<void> saveToDownload(String name, List<int> content) async {
+    const downloadDirPath = '/storage/emulated/0/Download'; // For Android
+    final filePath = '$downloadDirPath/${name}';
+    final file = File(filePath);
+    await file.writeAsBytes(content);
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 32ab99627..e70c37c69 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Cake Wallet.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 4.1.0+34
+version: 4.1.0+37
 
 environment:
   sdk: ">=2.7.0 <3.0.0"