Merge pull request #63 from Karumi/check-if-rosie-application-is-used…

…-before-to-downcast Fix #59.
Karumi · Apr 4, 2016 · bd7f557 · bd7f557
2 parents 84fca45 + a7e0b38
commit bd7f557
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/rosie/src/main/java/com/karumi/rosie/view/RosieActivity.java b/rosie/src/main/java/com/karumi/rosie/view/RosieActivity.java
@@ -130,6 +130,9 @@ private boolean shouldInitializeActivityScopeGraph() {
   }
 
   private void injectActivityModules() {
+    if (!(getApplication() instanceof RosieApplication)) {
+      return;
+    }
     RosieApplication rosieApplication = (RosieApplication) getApplication();
     List<Object> additionalModules = getActivityScopeModules();
     if (additionalModules == null) {

diff --git a/rosie/src/main/java/com/karumi/rosie/view/RosieAppCompatActivity.java b/rosie/src/main/java/com/karumi/rosie/view/RosieAppCompatActivity.java
@@ -130,6 +130,9 @@ protected final void registerPresenter(RosiePresenter presenter) {
   }
 
   private void injectActivityModules() {
+    if (!(getApplication() instanceof RosieApplication)) {
+      return;
+    }
     RosieApplication rosieApplication = (RosieApplication) getApplication();
     List<Object> additionalModules = getActivityScopeModules();
     if (additionalModules == null) {