From a165e84c4e980c6fe2f4f73a9aa3fe1d75ea9353 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Tue, 12 Sep 2017 16:37:26 -0500
Subject: [PATCH] Wip

---
 android/app/build.gradle                       |  7 +++----
 .../java/com/sn_react/MainApplication.java     | 18 ++++++++----------
 android/settings.gradle                        |  3 +--
 package.json                                   |  1 +
 src/lib/auth.js                                |  3 ++-
 src/screens/Account.js                         |  2 +-
 vendor/react-native-mail                       |  2 +-
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f9a634a4..c21262ab 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,15 +138,14 @@ android {
 }
 
 dependencies {
-    compile project(':react-native-keychain')
-    compile project(':react-native-vector-icons')
-    compile project(':react-native-aes-crypto')
     compile project(':RNMail')
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.0.1'
     compile 'com.facebook.react:react-native:+'
-    // From node_modules
     compile project(':react-native-navigation')
+    compile project(':react-native-keychain')
+    compile project(':react-native-vector-icons')
+    compile project(':react-native-aes-crypto')
 }
 
 // Run this once to be able to run the application with BUCK
diff --git a/android/app/src/main/java/com/sn_react/MainApplication.java b/android/app/src/main/java/com/sn_react/MainApplication.java
index a13f3771..1e9470b8 100644
--- a/android/app/src/main/java/com/sn_react/MainApplication.java
+++ b/android/app/src/main/java/com/sn_react/MainApplication.java
@@ -1,22 +1,20 @@
 package com.sn_react;
 
-import android.app.Application;
+import android.support.annotation.Nullable;
 
-//import com.facebook.react.ReactApplication;
-import com.oblador.keychain.KeychainPackage;
-import com.oblador.vectoricons.VectorIconsPackage;
-import com.tectiv3.aes.RCTAesPackage;
-import com.facebook.react.ReactNativeHost;
+import com.chirag.RNMail.RNMail;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-
-import android.support.annotation.Nullable;
+import com.oblador.keychain.KeychainPackage;
+import com.oblador.vectoricons.VectorIconsPackage;
+import com.reactnativenavigation.NavigationApplication;
+import com.tectiv3.aes.RCTAesPackage;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.reactnativenavigation.NavigationApplication;
+//import com.facebook.react.ReactApplication;
 
 public class MainApplication extends NavigationApplication {
 
@@ -29,7 +27,7 @@ public class MainApplication extends NavigationApplication {
 
     protected List<ReactPackage> getPackages() {
       return Arrays.asList(
-            new MainReactPackage(),
+//            new MainReactPackage(),
             new KeychainPackage(),
             new VectorIconsPackage(),
             new RCTAesPackage(),
diff --git a/android/settings.gradle b/android/settings.gradle
index a725a30d..985bf577 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,7 +1,6 @@
 rootProject.name = 'sn_react'
-
 include ':react-native-navigation'
-project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../vendor/react-native-navigation/android')
+project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../vendor/react-native-navigation/android/app')
 
 include ':react-native-keychain'
 project(':react-native-keychain').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keychain/android')
diff --git a/package.json b/package.json
index 6fc6a71b..e6a3e703 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "react": "16.0.0-alpha.12",
     "react-native": "0.48.1",
     "react-native-keychain": "^1.2.1",
+    "react-native-navigation": "^1.1.216",
     "react-native-search-box": "0.0.11",
     "react-native-vector-icons": "^4.3.0"
   },
diff --git a/src/lib/auth.js b/src/lib/auth.js
index be0f7081..bb77218d 100644
--- a/src/lib/auth.js
+++ b/src/lib/auth.js
@@ -216,7 +216,8 @@ export default class Auth {
       callback(response, null);
     }, function(response){
       console.log("Error getting auth params", response);
-      callback(null, response.error);
+      var error = response.error || {message: response};
+      callback(null, error);
     })
   }
 
diff --git a/src/screens/Account.js b/src/screens/Account.js
index 4f99d4a9..5d5f6166 100644
--- a/src/screens/Account.js
+++ b/src/screens/Account.js
@@ -204,7 +204,7 @@ export default class Account extends Abstract {
       isHTML: true,
       attachment: {
         data: base64String,
-        type: 'json',   // Mime Type: jpg, png, doc, ppt, html, pdf
+        type: '.json',   // Mime Type: jpg, png, doc, ppt, html, pdf
         name: 'backup',   // Optional: Custom filename for attachment
       }
     }, (error, event) => {
diff --git a/vendor/react-native-mail b/vendor/react-native-mail
index 3297d856..e7179208 160000
--- a/vendor/react-native-mail
+++ b/vendor/react-native-mail
@@ -1 +1 @@
-Subproject commit 3297d856711e01718b0040b7b9f3d1bcc8b8d72f
+Subproject commit e717920817e55dc6d55cfe708af6930ec045c25c