mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Fixed setting rule start/end time

Browse source
This commit is contained in:
M66B 2020-06-05 08:23:40 +02:00
parent 564878dda0
commit 40baad0b17
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/FragmentRule.java
View file

@ -55,7 +55,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -553,11 +552,11 @@ public class FragmentRule extends FragmentBase {
break;
case REQUEST_SCHEDULE_START:
if (resultCode == RESULT_OK)
onScheduleStart(data);
onScheduleStart(data.getBundleExtra("args"));
break;
case REQUEST_SCHEDULE_END:
if (resultCode == RESULT_OK)
onScheduleEnd(data);
onScheduleEnd(data.getBundleExtra("args"));
break;
}
} catch (Throwable ex) {
@ -618,15 +617,15 @@ public class FragmentRule extends FragmentBase {
}.execute(this, args, "rule:delete");
}
private void onScheduleStart(Intent data) {
int minutes = data.getIntExtra("minutes", 0);
private void onScheduleStart(Bundle args) {
int minutes = args.getInt("minutes", 0);
tvScheduleHourStart.setTag(minutes);
tvScheduleHourStart.setText(formatHour(getContext(), minutes));
cbScheduleEnd.setChecked(true);
}
private void onScheduleEnd(Intent data) {
int minutes = data.getIntExtra("minutes", 0);
private void onScheduleEnd(Bundle args) {
int minutes = args.getInt("minutes", 0);
tvScheduleHourEnd.setTag(minutes);
tvScheduleHourEnd.setText(formatHour(getContext(), minutes));
cbScheduleEnd.setChecked(true);
@ -1127,12 +1126,8 @@ public class FragmentRule extends FragmentBase {
}
public void onTimeSet(TimePicker view, int hour, int minute) {
Fragment target = getTargetFragment();
if (target != null) {
Intent data = new Intent();
data.putExtra("minutes", hour * 60 + minute);
target.onActivityResult(getTargetRequestCode(), RESULT_OK, data);
}
getArguments().putInt("minutes", hour * 60 + minute);
sendResult(RESULT_OK);
}
}