mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2789 from nextcloud/mListener

Browse source 
mlistener might be null?
This commit is contained in:
Andy Scherzinger 2018-07-12 17:55:28 +02:00 committed by GitHub
commit c5260c2484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
View file

@ -57,36 +57,26 @@ public class ConflictsResolveDialog extends DialogFragment {
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity(), R.style.Theme_ownCloud_Dialog)
return new AlertDialog.Builder(requireActivity(), R.style.Theme_ownCloud_Dialog)
.setIcon(R.drawable.ic_warning)
.setTitle(R.string.conflict_title)
.setMessage(getString(R.string.conflict_message))
.setPositiveButton(R.string.conflict_use_local_version,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null) {
mListener.conflictDecisionMade(Decision.OVERWRITE);
}
(dialog, which) -> {
if (mListener != null) {
mListener.conflictDecisionMade(Decision.OVERWRITE);
}
})
.setNeutralButton(R.string.conflict_keep_both,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null) {
mListener.conflictDecisionMade(Decision.KEEP_BOTH);
}
(dialog, which) -> {
if (mListener != null) {
mListener.conflictDecisionMade(Decision.KEEP_BOTH);
}
})
.setNegativeButton(R.string.conflict_use_server_version,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null) {
mListener.conflictDecisionMade(Decision.SERVER);
}
(dialog, which) -> {
if (mListener != null) {
mListener.conflictDecisionMade(Decision.SERVER);
}
})
.create();
@ -103,18 +93,11 @@ public class ConflictsResolveDialog extends DialogFragment {
this.show(ft, "dialog");
}
public void dismissDialog(AppCompatActivity activity) {
Fragment prev = activity.getSupportFragmentManager().findFragmentByTag(getTag());
if (prev != null) {
FragmentTransaction ft = activity.getSupportFragmentManager().beginTransaction();
ft.remove(prev);
ft.commit();
}
}
@Override
public void onCancel(DialogInterface dialog) {
mListener.conflictDecisionMade(Decision.CANCEL);
if (mListener != null) {
mListener.conflictDecisionMade(Decision.CANCEL);
}
}
public interface OnConflictDecisionMadeListener {