Opentask view Support #1279

mebitek · 2022-12-19T15:46:50Z

I added Opentask support in read-only mode:
current features

show/hide task calendars
view task on day, week, month and agenda view
view task detail with markdown support
support Opentask
share task as VTODO
add option to show/hide non-visible calendars in main preferences list
widget show tasks

mebitek · 2022-12-19T15:47:23Z

@jspricke I think that now is better

jspricke

stopped after finding two problems..

Please don't open new PRs but keep this one now.

app/src/main/AndroidManifest.xml

app/src/main/java/com/android/calendar/Event.java

mebitek · 2022-12-19T15:58:18Z

@jspricke maybe I not understanding the situation but if I compare my branch with master etar I get this:
master...mebitek:Etar-Calendar:master

could you please help me to understand?

jspricke · 2022-12-19T16:19:38Z

You undo the changes in your last commit: c68bf76

Instead you should use git rebase -i to squash those changes into the original commits.

jspricke · 2022-12-19T18:32:54Z

Can you please finish your commits before pushing, as every push produces a mail for me ;).

mebitek · 2022-12-19T18:49:53Z

@jspricke sorry but I cannot understand how to solve this situation. I think that I solve as
https://github.com/Etar-Group/Etar-Calendar/compare/master...mebitek:Etar-Calendar:master?expand=1 says.
if not I need help

jspricke · 2022-12-19T20:11:21Z

See your list of commits here: https://github.com/Etar-Group/Etar-Calendar/pull/1279/commits
You have split your PR in individual commits, which is a good thing as it helps us to understand your changes. You ca, show the individual commits, for example: 4cfce30 and as you can see, it still contains unrelated changes that are undone in a later commit. This makes it hard to review because we need to find the relevant changes and keep in mind to check if the unrelated changes are fixed later. Also it makes it hard to understand whenever someone has to go back in the commit history to find out from where a change came. So instead you want to go back to fix that commit to contain only the relevant changes. git rebase -i does that, you can set a commit to edit, undo the changes and then go to the next one. Here are some articles that may be useful:
https://about.gitlab.com/blog/2018/06/07/keeping-git-commit-history-clean/
https://medium.com/@catalinaturlea/clean-git-history-a-step-by-step-guide-eefc0ad8696d

Gitsaibot · 2022-12-21T15:55:30Z

All the git stuff is something for @jspricke ;). I'll try to test this over the holidays when I get a chance.

jspricke

Thanks for fixing the commits, looks much better now.
I've left some general comments, but did not look into the patches deeply.

For the requested changes you can use git add -i and git commit --fixup <sha1> to add fixup commits that can be autosquashed later.

app/src/main/java/com/android/calendar/Event.java

app/src/main/java/com/android/calendar/AllInOneActivity.java

app/src/main/java/com/android/calendar/EventInfoFragment.java

app/src/main/java/com/android/calendar/month/MonthByWeekFragment.java

Gitsaibot · 2023-01-05T23:38:32Z

If I click on "View Tasks" in Agenda View Etar crashes(Failed to find provider info for org.dmfs.tasks)
And I get a lot of "E/CalEvent: buildEventsFromCursor: null cursor or null events list!" messages.

mebitek · 2023-01-06T08:23:54Z

Are opentasks installed? I think I miss the check on agenda view?

Gitsaibot · 2023-01-06T11:54:11Z

Yes I haven't installed it yet.

mebitek · 2023-01-11T07:29:29Z

@Gitsaibot fixed. added a check to see if opentasks has been installed. if not the menu "view tasks" is not visible

Gitsaibot · 2023-01-17T17:22:33Z

When opentask is not installed i still get these debug messages:

debug E/ActivityThread: Failed to find provider info for org.dmfs.tasks
2023-01-17 18:06:01.425 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:02.393 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:03.996 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:04.985 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:06.176 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:07.642 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:08.611 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:10.254 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:11.723 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:12.816 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!
2023-01-17 18:06:15.706 2172-2172/ws.xsoh.etar.debug E/CalEvent: buildEventsFromCursor: null cursor or null events list!

mebitek · 2023-01-18T13:07:32Z

@Gitsaibot fixed

README.md

Gitsaibot · 2023-01-18T20:28:19Z

I still get the messages when I switch between calendar views.

mebitek · 2023-01-19T07:13:15Z

@Gitsaibot now is fixed

jspricke

I did some clean up of the commits, please update your local branch before doing new changes, for example by:

git fetch origin
get reset --hard origin/master

jspricke · 2023-04-01T08:52:29Z

app/src/main/java/com/android/calendar/EventInfoActivity.java

@@ -147,7 +147,7 @@ protected void onCreate(Bundle icicle) {
        if (mInfoFragment == null) {
            FragmentManager fragmentManager = getFragmentManager();
            FragmentTransaction ft = fragmentManager.beginTransaction();
-            mInfoFragment = new EventInfoFragment(this, mEventId, mStartMillis, mEndMillis,
+            mInfoFragment = new EventInfoFragment(this, intent.getData(), mStartMillis, mEndMillis,


are you sure intent is never null here?

app/src/main/java/com/android/calendar/settings/CalendarDataStore.kt

jspricke · 2023-04-01T08:58:50Z

app/src/main/java/com/android/calendar/persistence/CalendarRepository.kt

+        if (isTask) {
+            val taskUri =
+                ContentUris.withAppendedId(DmfsOpenTasksContract.TaskLists.PROVIDER_URI, calendarId)
+            contentResolver.query(taskUri, ACCOUNT_PROJECTION, null, null, null)?.use {
+                if (it.moveToFirst()) {
+                    val accountName = it.getString(PROJECTION_ACCOUNT_INDEX_NAME)
+                    val accountType = it.getString(PROJECTION_ACCOUNT_INDEX_TYPE)
+                    return Account(accountName, accountType)
+                }
+            }
+        } else {
+            val calendarUri =
+                ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, calendarId)
+            contentResolver.query(calendarUri, ACCOUNT_PROJECTION, null, null, null)?.use {
+                if (it.moveToFirst()) {
+                    val accountName = it.getString(PROJECTION_ACCOUNT_INDEX_NAME)
+                    val accountType = it.getString(PROJECTION_ACCOUNT_INDEX_TYPE)
+                    return Account(accountName, accountType)
+                }
            }
        }


Suggested change

if (isTask) {

val taskUri =

ContentUris.withAppendedId(DmfsOpenTasksContract.TaskLists.PROVIDER_URI, calendarId)

contentResolver.query(taskUri, ACCOUNT_PROJECTION, null, null, null)?.use {

if (it.moveToFirst()) {

val accountName = it.getString(PROJECTION_ACCOUNT_INDEX_NAME)

val accountType = it.getString(PROJECTION_ACCOUNT_INDEX_TYPE)

return Account(accountName, accountType)

}

}

} else {

val calendarUri =

ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, calendarId)

contentResolver.query(calendarUri, ACCOUNT_PROJECTION, null, null, null)?.use {

if (it.moveToFirst()) {

val accountName = it.getString(PROJECTION_ACCOUNT_INDEX_NAME)

val accountType = it.getString(PROJECTION_ACCOUNT_INDEX_TYPE)

return Account(accountName, accountType)

}

}

}

if (isTask) {

val uri =

ContentUris.withAppendedId(DmfsOpenTasksContract.TaskLists.PROVIDER_URI, calendarId)

} else {

val uri =

ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, calendarId)

}

contentResolver.query(uri, ACCOUNT_PROJECTION, null, null, null)?.use {

if (it.moveToFirst()) {

val accountName = it.getString(PROJECTION_ACCOUNT_INDEX_NAME)

val accountType = it.getString(PROJECTION_ACCOUNT_INDEX_TYPE)

return Account(accountName, accountType)

}

}

}

app/src/main/java/com/android/calendar/EventInfoFragment.java

app/src/main/java/com/android/calendar/agenda/AgendaListView.java

app/src/main/java/com/android/calendar/AllInOneActivity.java

app/src/main/java/com/android/calendar/agenda/AgendaAdapter.java

app/src/main/java/com/android/calendar/EventInfoFragment.java

app/src/main/java/com/android/calendar/widget/CalendarAppWidgetModel.java

jspricke · 2023-04-01T09:25:06Z

app/src/main/java/com/android/calendar/widget/CalendarAppWidgetModel.java

            // populate the day buckets that this event falls into
-            int from = Math.max(startDay, mTodayJulianDay);
-            int to = Math.min(endDay, mMaxJulianDay);
+            int from = Math.max(Time.getJulianDay(mEventInfo.start, new Time().getGmtOffset()), mTodayJulianDay);


can you give some explanation here?

same as before. tasks has no begin time, so it will be recalcualted

can you give some more explanation? Why do you need a loop? Why an extra method? Why change the computation?

cause tasks comes from different objects than events, so I need to calculate dates

Would it be possible to compute them in the object instead of different times in the code?

@mebitek just a friendly pint. Do you have any comment here? I think I would be fine with the current state but maybe this would simplify the code a bit.

@jspricke sorry but I was a little busy these days. if it will be possiible to leave as it is for now should be better for me

app/src/main/java/com/android/calendar/widget/CalendarAppWidgetModel.java

jspricke · 2023-04-10T19:37:52Z

app/src/main/java/com/android/calendar/widget/CalendarAppWidgetModel.java

            // populate the day buckets that this event falls into
-            int from = Math.max(startDay, mTodayJulianDay);
-            int to = Math.min(endDay, mMaxJulianDay);
+            int from = Math.max(Time.getJulianDay(mEventInfo.start, new Time().getGmtOffset()), mTodayJulianDay);


can you give some more explanation? Why do you need a loop? Why an extra method? Why change the computation?

jspricke · 2023-04-10T19:59:03Z

app/src/main/java/com/android/calendar/settings/CalendarDataStore.kt

            if (it.moveToFirst()) {
                return it.getString(it.getColumnIndex(databaseKey))
            }
        }
        return defValue
    }
+    private  fun getValues(key: String?) : Map<String, Any> {


nit: missing new line.

the loop was already present. I just move variables to meet day calculation

new line fixed

sorry to be really picky but you added a new line and four spaces, please remove them.

the loop was already present. I just move variables to meet day calculation

Well, the PR duplicates https://github.com/Etar-Group/Etar-Calendar/pull/1279/files#diff-0c9e564dd7ccd03597c26106698536e263e2459daa6d329134ecf2f82b244c6dR70 in https://github.com/Etar-Group/Etar-Calendar/pull/1279/files#diff-0c9e564dd7ccd03597c26106698536e263e2459daa6d329134ecf2f82b244c6dR141 making the first one superfluous and adds a second loop here https://github.com/Etar-Group/Etar-Calendar/pull/1279/files#diff-0c9e564dd7ccd03597c26106698536e263e2459daa6d329134ecf2f82b244c6dR145 (that's the one I'm asking for).

sorry I do not understand

Why is there the loop in https://github.com/Etar-Group/Etar-Calendar/pull/1279/files#diff-0c9e564dd7ccd03597c26106698536e263e2459daa6d329134ecf2f82b244c6dR145

This loop should be deleted (if we keep this refactoring): https://github.com/Etar-Group/Etar-Calendar/pull/1279/files#diff-0c9e564dd7ccd03597c26106698536e263e2459daa6d329134ecf2f82b244c6dR70

if I remeber well it's cause tasks has different time enconding in front of events, so I need to recalculate

jspricke · 2023-04-27T07:30:20Z

I gave this a quick try and it shows tasks nicely but clicking on a task shows an empty loading screen and editing one loads a different event. Can you implement some workaround there?

mebitek · 2023-04-27T10:41:03Z

just tested now and seems to work on my android, can you provide more details?

jspricke · 2023-04-27T10:44:04Z

Not sure what to provide, what happens when you select a task from the calendar?

mebitek · 2023-04-27T11:37:54Z

Not sure what to provide, what happens when you select a task from the calendar?

it should open the task details, in readonly mode

mebitek · 2023-06-22T07:23:13Z

@jspricke @Gitsaibot any news about this pull request?

tamas646 · 2023-10-05T20:59:27Z

I gave this a quick try and it shows tasks nicely but clicking on a task shows an empty loading screen and editing one loads a different event. Can you implement some workaround there?

@mebitek I experience the same behaviour. When I select a task, it shows an empty loading screen.

cboehm-it · 2024-01-16T16:16:12Z

Hey that feature seems to be very cool. Is there already a release planned for it? 🙂

tamas646 · 2024-01-16T16:56:21Z

@immertroll There are still some issues/incomplete parts with this feature which is the reason why this pull request has not been merged yet.
You can build some debug apk for yourself from mebitek's repository (https://github.com/mebitek/Etar-Calendar) using Android Studio (as I did). This way you can use the feature but as I said there are some incomplete parts in it (and of course it's based on an older version of Etar-Calendar with no upgrading possibility).

It would be great if someone would complete the feature and therefore it could be added to Etar.

This reverts commit 73dc2a5, reversing changes made to 137fc48.

estux · 2024-06-06T15:29:31Z

@immertroll There are still some issues/incomplete parts with this feature which is the reason why this pull request has not been merged yet. You can build some debug apk for yourself from mebitek's repository (https://github.com/mebitek/Etar-Calendar) using Android Studio (as I did). This way you can use the feature but as I said there are some incomplete parts in it (and of course it's based on an older version of Etar-Calendar with no upgrading possibility).

It would be great if someone would complete the feature and therefore it could be added to Etar.

It would be great to also add support for Tasks app as OpenTask is not developed anymore and it's becoming outdated.
Thanks for the work done so far!

jspricke requested changes Dec 19, 2022

View reviewed changes

app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved

app/src/main/java/com/android/calendar/Event.java Outdated Show resolved Hide resolved

mebitek force-pushed the master branch 5 times, most recently from e2a5760 to ce843fe Compare December 19, 2022 18:31

mebitek force-pushed the master branch from ce843fe to df5aa6b Compare December 19, 2022 18:42

mebitek closed this Dec 20, 2022

mebitek force-pushed the master branch from df5aa6b to cf28b8e Compare December 20, 2022 10:04

mebitek reopened this Dec 20, 2022

mebitek requested a review from jspricke December 20, 2022 10:04

jspricke requested changes Dec 21, 2022

View reviewed changes

app/src/main/java/com/android/calendar/Event.java Outdated Show resolved Hide resolved

app/src/main/java/com/android/calendar/AllInOneActivity.java Show resolved Hide resolved

app/src/main/java/com/android/calendar/EventInfoFragment.java Show resolved Hide resolved

jspricke reviewed Dec 22, 2022

View reviewed changes

app/src/main/java/com/android/calendar/month/MonthByWeekFragment.java Outdated Show resolved Hide resolved

mebitek requested a review from jspricke December 31, 2022 10:54

Gitsaibot reviewed Jan 18, 2023

View reviewed changes

README.md Outdated Show resolved Hide resolved

mebitek added 3 commits April 1, 2023 11:12

view tasks in agenda view

9cd8696

add share tasks as VTODO

abe5f52

add widget show tasks

b2af45f

jspricke force-pushed the master branch from 11e8e73 to b2af45f Compare April 1, 2023 09:12

jspricke requested changes Apr 1, 2023

View reviewed changes

mebitek added 6 commits April 1, 2023 13:20

fixup! add share tasks as VTODO

7e6cb94

fixup! view tasks in agenda view

6d6c3d9

fixup! implement view tasks in day and week view

2afae33

fixup! implement view tasks in day and week view

47d70dd

fixup! view tasks in agenda view

c9a7642

fixup! fixup! implement view tasks in day and week view

1f39155

jspricke reviewed Apr 10, 2023

View reviewed changes

mebitek added 4 commits April 11, 2023 06:47

fixup! add widget show tasks

6d3002c

fixup! implement view tasks in day and week view

a798b92

fixup! view tasks in agenda view

9f76498

fixup! implement view tasks in day and week view

137fc48

This was referenced Oct 5, 2023

doesn't show Tasks #1423

Open

Show task in Calendar #83

Open

mebitek added 2 commits April 11, 2024 08:04

Merge remote-tracking branch 'etar/master'

73dc2a5

Revert "Merge remote-tracking branch 'etar/master'"

212ca46

This reverts commit 73dc2a5, reversing changes made to 137fc48.

bemyak mentioned this pull request Jun 22, 2024

CalDAV Task support FossifyOrg/Calendar#36

Open

5 tasks

Opentask view Support #1279

Are you sure you want to change the base?

Opentask view Support #1279

Conversation

mebitek commented Dec 19, 2022

mebitek commented Dec 19, 2022

jspricke left a comment

Choose a reason for hiding this comment

mebitek commented Dec 19, 2022

jspricke commented Dec 19, 2022

jspricke commented Dec 19, 2022

mebitek commented Dec 19, 2022

jspricke commented Dec 19, 2022

Gitsaibot commented Dec 21, 2022

jspricke left a comment

Choose a reason for hiding this comment

Gitsaibot commented Jan 5, 2023 • edited Loading

mebitek commented Jan 6, 2023

Gitsaibot commented Jan 6, 2023

mebitek commented Jan 11, 2023

Gitsaibot commented Jan 17, 2023

mebitek commented Jan 18, 2023

Gitsaibot commented Jan 18, 2023

mebitek commented Jan 19, 2023

jspricke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jspricke Apr 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jspricke commented Apr 27, 2023

mebitek commented Apr 27, 2023 • edited Loading

jspricke commented Apr 27, 2023

mebitek commented Apr 27, 2023

mebitek commented Jun 22, 2023

tamas646 commented Oct 5, 2023

cboehm-it commented Jan 16, 2024

tamas646 commented Jan 16, 2024

estux commented Jun 6, 2024

Gitsaibot commented Jan 5, 2023 •

edited

Loading

jspricke Apr 11, 2023 •

edited

Loading

mebitek commented Apr 27, 2023 •

edited

Loading