Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 06:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1176-startup-failure-crash' into 'master'

Browse Source 
Inject StartupFailureActivity to prevent NPE

Closes #1176

See merge request akwizgran/briar!705
This commit is contained in:
Torsten Grote
2018-02-23 12:24:29 +00:00
parent 3f1fb1ca1c d5c89640c1
commit 05210257a0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java
View File

@@ -25,7 +25,7 @@ public class StartupFailureActivity extends BaseActivity {
@Override @Override
public void injectActivity(ActivityComponent component) { public void injectActivity(ActivityComponent component) {
component.inject(this);
} }
private void handleIntent(Intent i) { private void handleIntent(Intent i) {

3
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.activity;
import android.app.Activity; import android.app.Activity;
import org.briarproject.briar.android.AndroidComponent; 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.BlogActivity;
import org.briarproject.briar.android.blog.BlogFragment; import org.briarproject.briar.android.blog.BlogFragment;
import org.briarproject.briar.android.blog.BlogModule; import org.briarproject.briar.android.blog.BlogModule;
@@ -151,6 +152,8 @@ public interface ActivityComponent {
void inject(RssFeedManageActivity activity); void inject(RssFeedManageActivity activity);
void inject(StartupFailureActivity activity);
// Fragments // Fragments
void inject(AuthorNameFragment fragment); void inject(AuthorNameFragment fragment);