From f880ddcec13430001de23ce2a175ff2f29b1444b Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 23 Jun 2015 12:07:21 +0200 Subject: [PATCH] don't launch crashlytics and instabug, when debug --- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 12 +++ Habitica/Habitica.iml | 78 +++++++++---------- .../android/habitica/HabiticaApplication.java | 4 +- .../android/habitica/MainActivity.java | 7 +- settings.gradle | 2 +- 6 files changed, 59 insertions(+), 46 deletions(-) create mode 100644 .idea/runConfigurations.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a3eaffb4..5d1998103 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml index 14dcfe5d7..863b3d596 100644 --- a/Habitica/Habitica.iml +++ b/Habitica/Habitica.iml @@ -84,7 +84,6 @@ - @@ -107,51 +106,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + + + + + + + + - - + + + + + + + + + + - - - - - - + + + + + + + - + + + + + + \ No newline at end of file diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java index b386236bd..fa1e97dee 100644 --- a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java +++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java @@ -13,6 +13,8 @@ public class HabiticaApplication extends Application { public void onCreate() { super.onCreate(); - Instabug.initialize(this, "a5aa5f471a9cd8a958c0c55181172655"); + if (!BuildConfig.DEBUG) { + Instabug.initialize(this, "a5aa5f471a9cd8a958c0c55181172655"); + } } } diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index b27a2a05b..d71716ba8 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -100,9 +100,10 @@ public class MainActivity extends ActionBarActivity implements OnTaskCreationLis setContentView(R.layout.main_with_drawer); - Crashlytics crashlytics = new Crashlytics.Builder().build(); - Fabric.with(this, crashlytics); - + if (!BuildConfig.DEBUG) { + Crashlytics crashlytics = new Crashlytics.Builder().build(); + Fabric.with(this, crashlytics); + } this.hostConfig = PrefsActivity.fromContext(this); if(hostConfig==null|| hostConfig.getApi()==null || hostConfig.getApi().equals("") || hostConfig.getUser() == null ||hostConfig.getUser().equals("")) { startActivity(new Intent(MainActivity.this, LoginActivity.class)); diff --git a/settings.gradle b/settings.gradle index 4e057b6d2..121ec445b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'Habitica' \ No newline at end of file +include 'Habitica', ':Habitica' \ No newline at end of file