From 81bd3e6b2f960dbb0a477d6efed1295cc39f1625 Mon Sep 17 00:00:00 2001 From: cyberarm Date: Tue, 29 Sep 2020 19:21:03 -0500 Subject: [PATCH] Fixed crashes due to Backend not being set before permissions are granted --- .../TimeCraftersConfigurationTool/MainActivity.java | 4 ++-- .../ui/editor/GroupsFragment.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java index 29d19ee..69be75f 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/MainActivity.java @@ -45,9 +45,9 @@ public class MainActivity extends AppCompatActivity { if (Backend.instance() == null) { new Backend(); } - } - Backend.instance().applicationContext = getApplicationContext(); + Backend.instance().applicationContext = getApplicationContext(); + } } @Override diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java index 8fd91d8..d1575bf 100644 --- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java +++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/editor/GroupsFragment.java @@ -60,12 +60,13 @@ public class GroupsFragment extends TimeCraftersFragment { }); floatingActionButtonAutoHide(actionButton, scrollView); - if (Backend.instance().getConfig() == null) { - actionButton.hide(); - } + if (Backend.instance() != null) { + if (Backend.instance().getConfig() == null) { + actionButton.hide(); + } - if (Backend.instance() != null) this.config = Backend.instance().getConfig(); + } if (config != null) { configName.setVisibility(View.GONE);