From 2fa166e381105523bacae389f7b976208e6034d0 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Sat, 25 Jun 2016 18:57:36 +0200
Subject: [PATCH] Fix potential NPE, setup environment earlier

---
 .../nodomain/freeyourgadget/gadgetbridge/GBApplication.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index cefb79b0f..df26fc158 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -120,12 +120,13 @@ public class GBApplication extends Application {
 
         setupExceptionHandler();
 
+        GB.environment = GBEnvironment.createDeviceEnvironment();
+
         setupDatabase(this);
 
         deviceManager = new DeviceManager(this);
 
         deviceService = createDeviceService();
-        GB.environment = GBEnvironment.createDeviceEnvironment();
 //        mActivityDatabaseHandler = new ActivityDatabaseHandler(context);
         loadBlackList();