Merge branch 'inject-dialog-fragments-early' into 'master'

Inject remaining fragments in onAttach()

See merge request briar/briar!1075

briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java

@@ -2,8 +2,9 @@ package org.briarproject.briar.android.conversation;
 
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AppCompatDialogFragment;
 import android.view.LayoutInflater;
@@ -13,8 +14,10 @@ import android.widget.Button;
 import android.widget.EditText;
 
 import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.activity.BaseActivity;
 
 import javax.inject.Inject;
 
@@ -22,6 +25,8 @@ import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
 
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
 public class AliasDialogFragment extends AppCompatDialogFragment {
 
 	final static String TAG = AliasDialogFragment.class.getName();
@@ -38,20 +43,25 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 	}
 
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
+	public void onAttach(Context ctx) {
+		super.onAttach(ctx);
+		((BaseActivity) requireActivity()).getActivityComponent().inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
 
-		BriarActivity a = (BriarActivity) requireNonNull(getActivity());
+		viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
-		a.getActivityComponent().inject(this);
-		viewModel = ViewModelProviders.of(getActivity(), viewModelFactory)
 				.get(ConversationViewModel.class);
 	}
 
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
+	public View onCreateView(LayoutInflater inflater,
-			ViewGroup container, Bundle savedInstanceState) {
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.fragment_alias_dialog, container,
 				false);
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.conversation;
 
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -55,10 +56,9 @@ public class ImageFragment extends Fragment {
 	}
 
 	@Override
-	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+	public void onAttach(Context ctx) {
-		super.onActivityCreated(savedInstanceState);
+		super.onAttach(ctx);
-		BaseActivity a = (BaseActivity) requireNonNull(getActivity());
+		((BaseActivity) requireActivity()).getActivityComponent().inject(this);
-		a.getActivityComponent().inject(this);
 	}
 
 	@Override
@@ -87,6 +87,7 @@ public class ImageFragment extends Fragment {
 
 		// Request Listener
 		RequestListener<Drawable> listener = new RequestListener<Drawable>() {
+
 			@Override
 			public boolean onLoadFailed(@Nullable GlideException e,
 					Object model, Target<Drawable> target,

briar-android/src/main/java/org/briarproject/briar/android/fragment/ScreenFilterDialogFragment.java

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.fragment;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -56,11 +57,9 @@ public class ScreenFilterDialogFragment extends DialogFragment {
 	}
 
 	@Override
-	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+	public void onAttach(Context ctx) {
-		super.onActivityCreated(savedInstanceState);
+		super.onAttach(ctx);
-		Activity activity = getActivity();
+		((BaseActivity) requireActivity()).getActivityComponent().inject(this);
-		if (activity == null) throw new IllegalStateException();
-		((BaseActivity) activity).getActivityComponent().inject(this);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

@@ -153,8 +153,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	public void onAttach(Context context) {
 		super.onAttach(context);
 		listener = (SettingsActivity) context;
-		// we need to inject here,
-		// because onActivityCreated() is called after onCreatePreferences()
 		listener.getActivityComponent().inject(this);
 	}
 
@@ -246,7 +244,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
 			Bundle savedInstanceState) {
 		View view = super.onCreateView(inflater, container, savedInstanceState);
 		ColorDrawable divider = new ColorDrawable(
-				ContextCompat.getColor(getContext(), R.color.divider));
+				ContextCompat.getColor(requireContext(), R.color.divider));
 		setDivider(divider);
 		return view;
 	}
@@ -486,8 +484,9 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		pref.setWidgetLayoutResource(0);
 		pref.setSummary(summary);
 		pref.setOnPreferenceClickListener(clickedPref -> {
+			String packageName = requireContext().getPackageName();
 			Intent intent = new Intent(ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-					.putExtra(EXTRA_APP_PACKAGE, getContext().getPackageName())
+					.putExtra(EXTRA_APP_PACKAGE, packageName)
 					.putExtra(EXTRA_CHANNEL_ID, channelId);
 			startActivity(intent);
 			return true;
@@ -580,8 +579,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
 							NavDrawerActivity.class);
 					intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 					intent.putExtra(INTENT_SIGN_OUT, true);
-					getActivity().startActivity(intent);
+					requireActivity().startActivity(intent);
-					getActivity().finish();
+					requireActivity().finish();
 				});
 		builder.setNegativeButton(R.string.cancel, null);
 		builder.setCancelable(false);