From 344916d57e2919d16f7d46bd766126c4f3dc83ce Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 5 Dec 2016 20:39:17 +0100
Subject: [PATCH] Catch encrypted opposing accounts. [skip ci]

---
 app/Helpers/Collector/JournalCollector.php      | 9 +++++++++
 app/Http/Controllers/Report/InOutController.php | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index 7816e1a61c..c4b3e8d3aa 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -16,6 +16,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
+use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -171,6 +172,14 @@ class JournalCollector implements JournalCollectorInterface
                 $transaction->date        = new Carbon($transaction->date);
                 $transaction->description = intval($transaction->encrypted) === 1 ? Crypt::decrypt($transaction->description) : $transaction->description;
                 $transaction->bill_name   = !is_null($transaction->bill_name) ? Crypt::decrypt($transaction->bill_name) : '';
+
+                // optionally decrypted:
+                try {
+                    $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name);
+                } catch (DecryptException $e) {
+                    // if this fails its already decrypted.
+                }
+
             }
         );
 
diff --git a/app/Http/Controllers/Report/InOutController.php b/app/Http/Controllers/Report/InOutController.php
index 2190e60f87..7e5ee6bc95 100644
--- a/app/Http/Controllers/Report/InOutController.php
+++ b/app/Http/Controllers/Report/InOutController.php
@@ -77,8 +77,8 @@ class InOutController extends Controller
             return $cache->get();
         }
 
-        $incomes  = $this->getIncomeReport($start, $end, $accounts);
-        $expenses = $this->getExpenseReport($start, $end, $accounts);
+        $incomes   = $this->getIncomeReport($start, $end, $accounts);
+        $expenses  = $this->getExpenseReport($start, $end, $accounts);
         $incomeSum = array_sum(
             array_map(
                 function ($item) {