From 5950d0e0be377665b9a452125183ddae002b7eb3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 3 Mar 2016 19:48:33 +1100
Subject: [PATCH 1/2] Bug Fixes

---
 app/Http/Controllers/AccountApiController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index c4672954124d..a94807186f5f 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -132,6 +132,8 @@ class AccountApiController extends BaseAPIController
                     $devices[$x]['token'] = $request->token; //update
                     $account->devices = json_encode($devices);
                     $account->save();
+                    $devices[$x]['account_key'] = $account->account_key;
+                    
                     return $this->response($devices[$x]);
                 }
             }
@@ -142,6 +144,7 @@ class AccountApiController extends BaseAPIController
             'token' => $request->token,
             'email' => $request->email,
             'device' => $request->device,
+            'account_key' => $account->account_key,
             'notify_sent' => TRUE,
             'notify_viewed' => TRUE,
             'notify_approved' => TRUE,
@@ -174,6 +177,7 @@ class AccountApiController extends BaseAPIController
                     'token' => $devices[$x]['token'],
                     'email' => $devices[$x]['email'],
                     'device' => $devices[$x]['device'],
+                    'account_key' => $account->account_key,
                     'notify_sent' => $request->notify_sent,
                     'notify_viewed' => $request->notify_viewed,
                     'notify_approved' => $request->notify_approved,

From fd4ec8cb6dcb4a26f6500d5337feb443f6ceed6e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 3 Mar 2016 20:52:47 +1100
Subject: [PATCH 2/2] bug fixes

---
 app/Http/Controllers/AccountApiController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index a94807186f5f..0de24981393a 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -133,7 +133,7 @@ class AccountApiController extends BaseAPIController
                     $account->devices = json_encode($devices);
                     $account->save();
                     $devices[$x]['account_key'] = $account->account_key;
-                    
+
                     return $this->response($devices[$x]);
                 }
             }
@@ -184,9 +184,9 @@ class AccountApiController extends BaseAPIController
                     'notify_paid' => $request->notify_paid,
                 ];
 
-                unset($devices[$x]);
+                //unset($devices[$x]);
 
-                $devices[] = $newDevice;
+                $devices[$x] = $newDevice;
                 $account->devices = json_encode($devices);
                 $account->save();