From d5c89640c15f7ecde72609e076f42192cdbec51d Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 23 Feb 2018 09:22:31 +0000
Subject: [PATCH] Inject StartupFailureActivity to prevent NPE.
---
.../org/briarproject/briar/android/StartupFailureActivity.java | 2 +-
.../briarproject/briar/android/activity/ActivityComponent.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
index 2b8288e06a..dc5c63fdc9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
@@ -25,7 +25,7 @@ public class StartupFailureActivity extends BaseActivity {
@Override
public void injectActivity(ActivityComponent component) {
-
+ component.inject(this);
}
private void handleIntent(Intent i) {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index 4066c384a7..7403d01e01 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -3,6 +3,7 @@ package org.briarproject.briar.android.activity;
import android.app.Activity;
import org.briarproject.briar.android.AndroidComponent;
+import org.briarproject.briar.android.StartupFailureActivity;
import org.briarproject.briar.android.blog.BlogActivity;
import org.briarproject.briar.android.blog.BlogFragment;
import org.briarproject.briar.android.blog.BlogModule;
@@ -151,6 +152,8 @@ public interface ActivityComponent {
void inject(RssFeedManageActivity activity);
+ void inject(StartupFailureActivity activity);
+
// Fragments
void inject(AuthorNameFragment fragment);
--
GitLab