From 0af779fc4ba887ecdccbfe8f348d32ba905ae2a1 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 5 Jul 2019 13:48:27 +0100
Subject: [PATCH 1/4] display information to the user upon account_unlock
 failure

---
 app/src/page/splash/view.js       | 90 ++++++++++++++++++++++++-------
 app/src/styles/splash.js          | 25 +++++++++
 src/main/python/lbrynetservice.py | 22 ++++----
 3 files changed, 107 insertions(+), 30 deletions(-)

diff --git a/app/src/page/splash/view.js b/app/src/page/splash/view.js
index b4ae47e5..57736bda 100644
--- a/app/src/page/splash/view.js
+++ b/app/src/page/splash/view.js
@@ -6,6 +6,7 @@ import { decode as atob } from 'base-64';
 import { navigateToUri } from 'utils/helper';
 import moment from 'moment';
 import AsyncStorage from '@react-native-community/async-storage';
+import Button from 'component/button';
 import ProgressBar from 'component/progressBar';
 import PropTypes from 'prop-types';
 import Colors from 'styles/colors';
@@ -14,25 +15,29 @@ import splashStyle from 'styles/splash';
 
 const BLOCK_HEIGHT_INTERVAL = 1000 * 60 * 2.5; // every 2.5 minutes
 
+const testingNetwork = 'Testing network';
+const waitingForResolution = 'Waiting for name resolution';
+
 class SplashScreen extends React.PureComponent {
   static navigationOptions = {
     title: 'Splash',
   };
 
-  componentWillMount() {
-    this.setState({
-      daemonReady: false,
-      details: 'Starting up...',
-      message: 'Connecting',
-      isRunning: false,
-      isLagging: false,
-      launchUrl: null,
-      isDownloadingHeaders: false,
-      headersDownloadProgress: 0,
-      shouldAuthenticate: false,
-      subscriptionsFetched: false,
-    });
+  state = {
+    accountUnlockFailed: false,
+    daemonReady: false,
+    details: 'Starting up',
+    message: 'Connecting',
+    isRunning: false,
+    isLagging: false,
+    launchUrl: null,
+    isDownloadingHeaders: false,
+    headersDownloadProgress: 0,
+    shouldAuthenticate: false,
+    subscriptionsFetched: false,
+  };
 
+  componentWillMount() {
     if (NativeModules.DaemonServiceControl) {
       NativeModules.DaemonServiceControl.startService();
     }
@@ -143,6 +148,10 @@ class SplashScreen extends React.PureComponent {
     });
   };
 
+  handleAccountUnlockFailed() {
+    this.setState({ accountUnlockFailed: true });
+  }
+
   _updateStatusCallback(status) {
     const { fetchSubscriptions, getSync, setClientSetting } = this.props;
     const startupStatus = status.startup_status;
@@ -155,8 +164,6 @@ class SplashScreen extends React.PureComponent {
       // to give us a better sense of when we are actually started
       this.setState({
         daemonReady: true,
-        message: 'Testing Network',
-        details: 'Waiting for name resolution',
         isLagging: false,
         isRunning: true,
       });
@@ -164,14 +171,29 @@ class SplashScreen extends React.PureComponent {
       // For now, automatically unlock the wallet if a password is set so that downloads work
       NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => {
         if (password && password.trim().length > 0) {
+          this.setState({
+            message: 'Unlocking account',
+            details: 'Decrypting wallet'
+          });
+
           // unlock the wallet and then finish the splash screen
           Lbry.account_unlock({ password })
-            .then(() => this.finishSplashScreen())
-            .catch(() => this.finishSplashScreen());
+            .then(() => {
+              this.setState({
+                message: testingNetwork,
+                details: waitingForResolution
+              });
+              this.finishSplashScreen();
+            })
+            .catch(() => this.handleAccountUnlockFailed());
           return;
+        } else {
+          this.setState({
+            message: testingNetwork,
+            details: waitingForResolution
+          });
+          this.finishSplashScreen();
         }
-
-        this.finishSplashScreen();
       });
 
       return;
@@ -253,9 +275,39 @@ class SplashScreen extends React.PureComponent {
       });
   }
 
+  handleContinueAnywayPressed = () => {
+    this.setState({
+      accountUnlockFailed: false,
+      message: testingNetwork,
+      details: waitingForResolution
+    }, () => this.finishSplashScreen());
+  }
+
   render() {
     const { message, details, isLagging, isRunning } = this.state;
 
+    if (this.state.accountUnlockFailed) {
+      return (
+        <View style={splashStyle.container}>
+          <Text style={splashStyle.errorTitle}>Oops! Something went wrong.</Text>
+          <Text style={splashStyle.paragraph}>
+            Your wallet failed to unlock, which means you may not be able to play any videos or access your funds.
+          </Text>
+          <Text style={splashStyle.paragraph}>
+            You can try to fix this by tapping Stop on the LBRY service notification and starting the app again. If the
+            problem continues, you may have to reinstall the app and restore your account.
+          </Text>
+
+          <Button
+            style={splashStyle.continueButton}
+            theme={'light'}
+            text={'Continue anyway'}
+            onPress={this.handleContinueAnywayPressed}
+          />
+        </View>
+      );
+    }
+
     return (
       <View style={splashStyle.container}>
         <Text style={splashStyle.title}>LBRY</Text>
diff --git a/app/src/styles/splash.js b/app/src/styles/splash.js
index 701eae79..4599ae22 100644
--- a/app/src/styles/splash.js
+++ b/app/src/styles/splash.js
@@ -14,6 +14,31 @@ const splashStyle = StyleSheet.create({
     marginBottom: 48,
     color: Colors.White,
   },
+  errorTitle: {
+    fontFamily: 'Inter-UI-Regular',
+    fontSize: 28,
+    marginBottom: 24,
+    marginLeft: 24,
+    marginRight: 24,
+    color: Colors.White,
+  },
+  paragraph: {
+    fontFamily: 'Inter-UI-Regular',
+    fontSize: 16,
+    lineHeight: 24,
+    marginBottom: 20,
+    marginLeft: 24,
+    marginRight: 24,
+    color: Colors.White,
+  },
+  continueButton: {
+    fontSize: 16,
+    backgroundColor: Colors.White,
+    marginTop: 24,
+    marginLeft: 24,
+    marginRight: 24,
+    alignSelf: 'flex-end'
+  },
   loading: {
     marginBottom: 36,
   },
diff --git a/src/main/python/lbrynetservice.py b/src/main/python/lbrynetservice.py
index 1fd28604..5b7eec34 100644
--- a/src/main/python/lbrynetservice.py
+++ b/src/main/python/lbrynetservice.py
@@ -6,13 +6,13 @@ import platform
 import sys
 from jnius import autoclass
 from keyring.backend import KeyringBackend
-from lbrynet import __version__ as lbrynet_version, build_type
-from lbrynet.conf import Config
-from lbrynet.extras.daemon.loggly_handler import get_loggly_handler
-from lbrynet.extras.daemon.Components import DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
-from lbrynet.extras.daemon.Daemon import Daemon
-from lbrynet.extras.daemon.loggly_handler import get_loggly_handler
-from lbrynet.utils import check_connection
+from lbry import __version__ as lbrynet_version, build_type
+from lbry.conf import Config
+from lbry.extras.daemon.loggly_handler import get_loggly_handler
+from lbry.extras.daemon.Components import DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
+from lbry.extras.daemon.Daemon import Daemon
+from lbry.extras.daemon.loggly_handler import get_loggly_handler
+from lbry.utils import check_connection
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
@@ -52,24 +52,24 @@ def configure_logging(conf):
         conf.log_file_path, maxBytes=2097152, backupCount=5
     )
     file_handler.setFormatter(default_formatter)
-    logging.getLogger('lbrynet').addHandler(file_handler)
+    logging.getLogger('lbry').addHandler(file_handler)
     logging.getLogger('torba').addHandler(file_handler)
 
     handler = logging.StreamHandler()
     handler.setFormatter(default_formatter)
 
     log.addHandler(handler)
-    logging.getLogger('lbrynet').addHandler(handler)
+    logging.getLogger('lbry').addHandler(handler)
     logging.getLogger('torba').addHandler(handler)
 
     logging.getLogger('aioupnp').setLevel(logging.WARNING)
     logging.getLogger('aiohttp').setLevel(logging.CRITICAL)
-    logging.getLogger('lbrynet').setLevel(logging.DEBUG if lbrynet_android_utils.isDebug() else logging.INFO)
+    logging.getLogger('lbry').setLevel(logging.DEBUG if lbrynet_android_utils.isDebug() else logging.INFO)
     logging.getLogger('torba').setLevel(logging.INFO)
 
     loggly_handler = get_loggly_handler()
     loggly_handler.setLevel(logging.ERROR)
-    logging.getLogger('lbrynet').addHandler(loggly_handler)
+    logging.getLogger('lbry').addHandler(loggly_handler)
 
 def start():
     keyring.set_keyring(LbryAndroidKeyring())
-- 
2.45.2


From adfa5b5e57ce69c53b5b4ce5a2fe2fc6596702c8 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 5 Jul 2019 13:49:10 +0100
Subject: [PATCH 2/4] prettier

---
 app/src/page/splash/view.js | 21 ++++++++++++---------
 app/src/styles/splash.js    |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/page/splash/view.js b/app/src/page/splash/view.js
index 57736bda..85f93082 100644
--- a/app/src/page/splash/view.js
+++ b/app/src/page/splash/view.js
@@ -173,7 +173,7 @@ class SplashScreen extends React.PureComponent {
         if (password && password.trim().length > 0) {
           this.setState({
             message: 'Unlocking account',
-            details: 'Decrypting wallet'
+            details: 'Decrypting wallet',
           });
 
           // unlock the wallet and then finish the splash screen
@@ -181,7 +181,7 @@ class SplashScreen extends React.PureComponent {
             .then(() => {
               this.setState({
                 message: testingNetwork,
-                details: waitingForResolution
+                details: waitingForResolution,
               });
               this.finishSplashScreen();
             })
@@ -190,7 +190,7 @@ class SplashScreen extends React.PureComponent {
         } else {
           this.setState({
             message: testingNetwork,
-            details: waitingForResolution
+            details: waitingForResolution,
           });
           this.finishSplashScreen();
         }
@@ -276,12 +276,15 @@ class SplashScreen extends React.PureComponent {
   }
 
   handleContinueAnywayPressed = () => {
-    this.setState({
-      accountUnlockFailed: false,
-      message: testingNetwork,
-      details: waitingForResolution
-    }, () => this.finishSplashScreen());
-  }
+    this.setState(
+      {
+        accountUnlockFailed: false,
+        message: testingNetwork,
+        details: waitingForResolution,
+      },
+      () => this.finishSplashScreen()
+    );
+  };
 
   render() {
     const { message, details, isLagging, isRunning } = this.state;
diff --git a/app/src/styles/splash.js b/app/src/styles/splash.js
index 4599ae22..2064f70c 100644
--- a/app/src/styles/splash.js
+++ b/app/src/styles/splash.js
@@ -37,7 +37,7 @@ const splashStyle = StyleSheet.create({
     marginTop: 24,
     marginLeft: 24,
     marginRight: 24,
-    alignSelf: 'flex-end'
+    alignSelf: 'flex-end',
   },
   loading: {
     marginBottom: 36,
-- 
2.45.2


From 301027e829d58ed9d817f723fc98b823e9998a9f Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 5 Jul 2019 13:50:00 +0100
Subject: [PATCH 3/4] remove trailing dots in messages

---
 app/src/page/splash/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/page/splash/view.js b/app/src/page/splash/view.js
index 85f93082..a28dcf2d 100644
--- a/app/src/page/splash/view.js
+++ b/app/src/page/splash/view.js
@@ -230,7 +230,7 @@ class SplashScreen extends React.PureComponent {
     } else {
       this.setState({
         message: 'Network Loading',
-        details: 'Initializing LBRY service...',
+        details: 'Initializing LBRY service',
       });
     }
 
-- 
2.45.2


From df0e3fc2ba4df4f01bc128b4dd1a5c9618b3b2d8 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Sun, 7 Jul 2019 15:25:01 +0100
Subject: [PATCH 4/4] update code per review

---
 app/src/page/splash/view.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/page/splash/view.js b/app/src/page/splash/view.js
index a28dcf2d..38a88f0e 100644
--- a/app/src/page/splash/view.js
+++ b/app/src/page/splash/view.js
@@ -287,9 +287,9 @@ class SplashScreen extends React.PureComponent {
   };
 
   render() {
-    const { message, details, isLagging, isRunning } = this.state;
+    const { accountUnlockFailed, message, details, isLagging, isRunning } = this.state;
 
-    if (this.state.accountUnlockFailed) {
+    if (accountUnlockFailed) {
       return (
         <View style={splashStyle.container}>
           <Text style={splashStyle.errorTitle}>Oops! Something went wrong.</Text>
-- 
2.45.2