Skip to content

Commit f7f35cd

Browse files
committed
fix android lint errors
1 parent 5fd5e6b commit f7f35cd

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,7 @@ public class AlertFragment extends DialogFragment implements DialogInterface.OnC
2828
/* package */ static final String ARG_BUTTON_NEUTRAL = "button_neutral";
2929
/* package */ static final String ARG_ITEMS = "items";
3030

31-
private final @Nullable DialogModule.AlertFragmentListener mListener;
32-
33-
public AlertFragment() {
34-
mListener = null;
35-
}
36-
37-
public AlertFragment(@Nullable DialogModule.AlertFragmentListener listener, Bundle arguments) {
38-
mListener = listener;
39-
setArguments(arguments);
40-
}
31+
private @Nullable DialogModule.AlertFragmentListener mListener;
4132

4233
public static Dialog createDialog(
4334
Context activityContext, Bundle arguments, DialogInterface.OnClickListener fragment) {
@@ -84,4 +75,8 @@ public void onDismiss(DialogInterface dialog) {
8475
mListener.onDismiss(dialog);
8576
}
8677
}
78+
79+
/*package*/ void setAlertFragmentListener(@Nullable DialogModule.AlertFragmentListener alertFragmentListener) {
80+
mListener = alertFragmentListener;
81+
}
8782
}

ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ public void showNewAlert(boolean isInForeground, Bundle arguments, Callback acti
131131
actionCallback != null ? new AlertFragmentListener(actionCallback) : null;
132132

133133
if (isUsingSupportLibrary()) {
134-
SupportAlertFragment alertFragment = new SupportAlertFragment(actionListener, arguments);
134+
SupportAlertFragment alertFragment = new SupportAlertFragment();
135+
alertFragment.setArguments(arguments);
136+
alertFragment.setAlertFragmentListener(actionListener);
135137
if (isInForeground) {
136138
if (arguments.containsKey(KEY_CANCELABLE)) {
137139
alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));
@@ -141,7 +143,10 @@ public void showNewAlert(boolean isInForeground, Bundle arguments, Callback acti
141143
mFragmentToShow = alertFragment;
142144
}
143145
} else {
144-
AlertFragment alertFragment = new AlertFragment(actionListener, arguments);
146+
AlertFragment alertFragment = new AlertFragment();
147+
alertFragment.setArguments(arguments);
148+
alertFragment.setAlertFragmentListener(actionListener);
149+
145150
if (isInForeground) {
146151
if (arguments.containsKey(KEY_CANCELABLE)) {
147152
alertFragment.setCancelable(arguments.getBoolean(KEY_CANCELABLE));

ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,7 @@
2121
*/
2222
public class SupportAlertFragment extends DialogFragment implements DialogInterface.OnClickListener {
2323

24-
private final @Nullable DialogModule.AlertFragmentListener mListener;
25-
26-
public SupportAlertFragment() {
27-
mListener = null;
28-
}
29-
30-
public SupportAlertFragment(@Nullable DialogModule.AlertFragmentListener listener, Bundle arguments) {
31-
mListener = listener;
32-
setArguments(arguments);
33-
}
24+
private @Nullable DialogModule.AlertFragmentListener mListener;
3425

3526
@Override
3627
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -51,4 +42,8 @@ public void onDismiss(DialogInterface dialog) {
5142
mListener.onDismiss(dialog);
5243
}
5344
}
45+
46+
/*package*/ void setAlertFragmentListener(@Nullable DialogModule.AlertFragmentListener alertFragmentListener) {
47+
mListener = alertFragmentListener;
48+
}
5449
}

0 commit comments

Comments
 (0)