From b1de48d109f6d8a0c0714b12b9f0a40764ff95c4 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 2 Jan 2020 15:59:40 +0100 Subject: [PATCH 1/2] make DueDate optional on MilestoneCreaton --- .../org/mian/gitnex/activities/NewMilestoneActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java index c2293ad..b9c11d1 100644 --- a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java @@ -117,15 +117,12 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl } } - if(newMilestoneDueDate.equals("")) { - - Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty)); - return; - + String finalMilestoneDueDate = null; + if(!newMilestoneDueDate.isEmpty()) { + finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate))); } disableProcessButton(); - String finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate))); createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate); } -- 2.40.1 From f5d0d4e389f1ac36533117c38c3f3175161e99b9 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 6 Jan 2020 12:41:29 +0100 Subject: [PATCH 2/2] add check again if gitea is older than 1.10.0 ... --- .../org/mian/gitnex/activities/NewMilestoneActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java index b9c11d1..61d68c5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java @@ -18,6 +18,7 @@ import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.Authorization; +import org.mian.gitnex.helpers.VersionCheck; import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.models.Milestones; import org.mian.gitnex.util.AppUtil; @@ -120,6 +121,10 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl String finalMilestoneDueDate = null; if(!newMilestoneDueDate.isEmpty()) { finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate))); + } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) { + // if Gitea version is less than 1.10.0 DueDate is required + Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty)); + return; } disableProcessButton(); -- 2.40.1