I was wondering whether there is any particular reason why only deadlines and schedules are implemented in orgzly, but not plain timestamps. I find the latter really helpful for appointsments etc. Also check gnu.org

Hello, Following the work on #382, I open a PR with new propositions. I reworked the code a bit to better integrate it with the previous code, and notably to handle [[...]] for file links (still linked to #360) in addition to the previous file: scheme. I also added an ImageSpan to display images in notes (rescaled to fit width, if larger than the window width), as a proposition to implement #147.

As before, this PR has been tested with API 16 (Nexus 5), API 23 (Pixel 2) & API 27 (Pixel 2 XL)

A small note sample, I used to test this:

[[Download/test.jpg]]

file:Download/test2.png

[[Download/test3.png][Test]]

Right now, named links are not replaced with an ImageSpan. Furthemore regarding to the application performance, maybe adding a setting to toggle off image display could be a good idea. What do you think about this ?

Hello,

This PR should fix #15. The basic functionalities should be covered. What is implemented:

• [x] Quickbar (Book and Query) buttons to clock-{in,out,cancel}
• [x] Clocking logic handling in OrgFormatter
  • [x] Allow to clock-in, only if a previous clocked-in entry is not already present
  • [x] Allow to clock-out, only if a previous clocked-in entry is present, and compute the spent time
  • [x] Allow to cancel the latest clock

What remains to be fixed:

• [x] Buttons for clock-{in,out,cancel} are currently the same alarm icon
  • Maybe having a clock icon with an arrow going in for clock-in, a clock icon with with an arrow going out for clock-out and a button with the strikethrough clock for org-cancel ? => using the hourglass_{top, bottom, disabled} material icons
• [ ] The regexes in OrgFormatter might be moved to OrgPatterns
• [ ] Kotlin code needs some improvement, as I do not have much experience in it
• [x] Maybe adding buttons in the note edition UI to clock-{in,out,cancel} ?

Thanks for your comments and suggestions for improvements !

Hi again, this is related to #24.

@nevenz, @IvanMalison could one of you please take a look at this draft to just get things working with regards to syncing a git repository? I'm working off the list mentioned in https://github.com/orgzly/orgzly-android/pull/173#issuecomment-336303192 but wanted to check that the base I'll be working on isn't busted first.

A few things I'm not sure about:

• We handle an initially empty git repo by checking for a RevCommit that is null or a getObjectId() that is null, this leads to a few strange checks, see e.g. https://github.com/orgzly/orgzly-android/commit/b3736b224a789580fbc1cd5c28ed6eafa7478b2a#diff-fed1654ff699f68e117dce23ae1625acR157 where null means that we should push.
• DataRepository is now sent as an argument to both GitRepo and RepoPreferences, maybe there's a better way to solve this?
• I'm not sure how sync back should be handled, currently SyncService#handleTwoWaySync checks if loadFile is null and in that case doesn't do much.
• I've made GitFileSynchronize#updateAndCommitFile() public since it seemed to fit what I wanted to do when there are no commits in the repo, thoughts?

Regarding authentication, I'd like to add support for generating a SSH-key as an alternative to user/pass authentication, should I do that in a later PR or can I cram that into this one?

Keeping the list of things to fix here, from #173:

Issues or missing features to be resolved before enabling this in the app

• [x] Warning when syncing from Android Studio

Warning:WARNING: Dependency org.apache.httpcomponents:httpclient:4.1.3 is ignored for fdroidDebug as it may be conflicting with the internal version provided by Android.

• [x] Building fails when doing ./gradlew build (proguard-rules.pro needs updating probably)

• [x] Asking for Storage permission before entering Git repo creation, leaving user in repos list, see 596ff7f9e604241093011b77df0c9d95d8b73465

• [ ] Prepopulate directory (Orgzly/repos/git in storage root or similar) Semi-done, currently a directory is created when none is selected and is auto-selected. But I'm not sure that's what we want to do if the user decides to setup another repo as we'll try to re-use that same folder in that case which won't work out.

• [x] On tapping checkmark (using [email protected]:nevenz/foo.git)

11-09 08:05:24.383  7914  7914 W System.err: java.io.IOException: Directory /storage/emulated/0/Download/git is not a git repository.
11-09 08:05:24.383  7914  7914 W System.err:    at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:109)
11-09 08:05:24.384  7914  7914 W System.err:    at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:73)
11-09 08:05:24.384  7914  7914 W System.err:    at com.orgzly.android.ui.fragments.GitRepoFragment$RepoCloneTask.doInBackground(GitRepoFragment.java:343)
11-09 08:05:24.384  7914  7914 W System.err:    at com.orgzly.android.ui.fragments.GitRepoFragment$RepoCloneTask.doInBackground(GitRepoFragment.java:312)

As far as I can tell this has been solved.

• [x] Had to delete selected (empty, created from browser) directory (can't use just browser, we have to type?)

• [x] Edit repo, change to non-existing URL, no check (dialog) this time, repo is accepted

• [x] Trying to sync gives "No repos configured" (with non-existing URL created above). Later discovered that the file from repository was downloaded at one point after all

• [x] "Unsupported repository type" trying to edit repo (non-existing URL)

11-09 08:15:50.019  7914  7914 W System.err: java.io.IOException: The file /storage/emulated/0/Documents/nevenz/foo2.git does not exist
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:105)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:73)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.repos.GitRepo.build(GitRepo.java:57)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.repos.GitRepo.buildFromUri(GitRepo.java:53)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.repos.RepoFactory.getFromUri(RepoFactory.java:49)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.repos.RepoFactory.getFromUri(RepoFactory.java:23)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.ui.ReposActivity.onRepoEditRequest(ReposActivity.java:188)
11-09 08:15:50.019  7914  7914 W System.err:    at com.orgzly.android.ui.fragments.ReposFragment.onListItemClick(ReposFragment.java:130)

Should be fixed, can't reproduce

• [x] Using https://[email protected]/nevenz/foo.git

10-12 23:20:20.008  6287  6416 E AndroidRuntime: Caused by: java.lang.ClassCastException: org.eclipse.jgit.transport.TransportHttp cannot be cast to org.eclipse.jgit.transport.SshTransport
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at com.orgzly.android.git.GitSSHKeyTransportSetter$2.configure(GitSSHKeyTransportSetter.java:40)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at org.eclipse.jgit.api.TransportCommand.configure(TransportCommand.java:138)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:128)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at org.eclipse.jgit.api.CloneCommand.fetch(CloneCommand.java:193)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at org.eclipse.jgit.api.CloneCommand.call(CloneCommand.java:133)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:91)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:73)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at com.orgzly.android.ui.fragments.GitRepoFragment$RepoCloneTask.doInBackground(GitRepoFragment.java:343)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at com.orgzly.android.ui.fragments.GitRepoFragment$RepoCloneTask.doInBackground(GitRepoFragment.java:312)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at android.os.AsyncTask$2.call(AsyncTask.java:305)
10-12 23:20:20.008  6287  6416 E AndroidRuntime:        at java.util.concurrent.FutureTask.run(FutureTask.java:237)

Partially fixed, using https now works, but you can not supply credentials, so this only works when authentication isn't needed. See #643 for the fix.

• [x] Clicking checkmark immediately (all fields empty): Snackbar with javaj.io.IOException: Failed to clone repository , null

• [x] Entering "asd" as URL and pressing checkmark

java.io.IOException: Failed to clone repository asd, org.eclipse.jgit.errors.NoRemoteRepositoryException: asd: not found.

this is fixed, however, maybe we should replace the progress modal with a progress bar of some kind?

• [x] Error checking for all other fields

• [x] Allow login with user/pass

• [ ] Update JGit version to a newer one and solve the entrySet() problem

Found during testing/changes from @amberin

• [ ] Changing the storage location for a repo makes the repo unusable
• [ ] mtime correction
• [ ] Change how conflict resolution is handled, push the conflicting merge branch to remote to allow fixing it somewhere else and then allow "force-pulling" a notebook. This probably doesn't fit in this PR but I wanted to remember it.

Minor stuff

• [x] Big button for Git needs to be added in repos list (between Dropbox and Directory)

• [x] Change order in + drop-down (Dropbox, Git, Directory)

• [x] Can't scroll down (not using ScrollView?)

• [x] Git branch's input is half a size (top half is cut off)

• [x] Snackbar displayed below opened keyboard

• [x] Action button (imeOptions) - actionNext for all but last, which should be actionDone

• [x] Remove "Git" from all hints

• [x] Git author (e.g. My Name) -> Name (e.g. John Doe)

• [x] Git email (e.g. [email protected]) -> Email (e.g. [email protected])

• [x] Git branch (e.g. master) -> Branch

• [x] Prepopulate branch with "master"

• [x] Fields with browse button don't have hint displayed when value is set (TextInputLayout missing?)

• [x] Git remote address -> Remote URL

• [x] Extract string resources displayed to user (errors etc.)

• [ ] Move git package to sync/ or repos/ (for now)

Thanks!

Is there any agenda view functionality in Orgzly equivalent to 'C-c a a' in Org-mode? To get the agenda of the coming week with a daily view, it seems that creating a search with: .i.done s.1w g.day
or
.i.done a.7d might be different ways to provide an agenda view. However, agenda (a) and grouping (g) seems to be not implemented. Is there a plan to support agenda views? and is there anyone working on this? If not, is extending the search with (a) and (g) the way to go?

I would be interested in working on this!

Looking for feedback. Its not yet ready for merge.

Has two features:

• onResume sync
• sync after notes are updated

Fixes:

• sync on resume text wrapping issue

Removed:

• floating sync activity button from prior pull request

Bugs:

• (FIXED, see below) notes after sync still indicate they need sync. Reporting problem or race condition.

missing:

• does not sync before applying changes for notes updated, would be nice to sync from file, then sync to file

Now what?

I could minimize the chance of this happening by setting auto-save in emacs, make sure dropbox is always running with a big warning if network can't connect.

On the orgzly side it would make sense to sync both before and after adding a new note.

But still, conflict is inevitable. The only way forward now seems to be to clear the database and start over. I guess I'd prefer some options like diff, merge, rename, remote wins, local wins.

This is happening on my first day of use; The very first time I tried adding a note with orgzly. I guess more experienced users have discovered a practice to avoid the situation. Please share how you do it.

Update

Clear database is not a great idea. You lose all your settings.

Occurs to me that if org files were simply saved on Google Drive as a text file that the system would take care of synchronization. Is that what others are doing?

Should fix the force load and force save crashes that were seen in #543. I also moved the creation of a view a bit earlier, otherwise the Git sync view crashed on initialization.

Also updated to allow rudimentary HTTP support. Username and password is currently saved in clear-text, this is something we probably want to change?

The remaining items now are:

• [x] Move git package to sync/ or repos/ (for now) Does this need to happen? The current layout seems reasonable to me

• [x] Update JGit version to a newer one and solve the entrySet() problem I don't think this can be solved without updating the android version we compile against which I guess we don't want to to keep backwards compatibility? Changing to a newer version yields the following error at runtime when trying to clone a repo:

2020-02-11 10:36:13.985 14248-14348/com.orgzly E/AndroidRuntime: FATAL EXCEPTION: AsyncTask #4
    Process: com.orgzly, PID: 14248
    java.lang.RuntimeException: An error occurred while executing doInBackground()
        at android.os.AsyncTask$3.done(AsyncTask.java:354)
        at java.util.concurrent.FutureTask.finishCompletion(FutureTask.java:383)
        at java.util.concurrent.FutureTask.setException(FutureTask.java:252)
        at java.util.concurrent.FutureTask.run(FutureTask.java:271)
        at android.os.AsyncTask$SerialExecutor$1.run(AsyncTask.java:245)
        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167)
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641)
        at java.lang.Thread.run(Thread.java:764)
     Caused by: java.lang.NoSuchMethodError: No virtual method keySet()Ljava/util/concurrent/ConcurrentHashMap$KeySetView; in class Ljava/util/concurrent/ConcurrentHashMap; or its super classes (declaration of 'java.util.concurrent.ConcurrentHashMap' appears in /system/framework/core-oj.jar)
        at org.eclipse.jgit.attributes.FilterCommandRegistry.getRegisteredFilterCommands(FilterCommandRegistry.java:118)
        at org.eclipse.jgit.treewalk.TreeWalk.<init>(TreeWalk.java:375)
        at org.eclipse.jgit.treewalk.TreeWalk.<init>(TreeWalk.java:339)
        at org.eclipse.jgit.submodule.SubmoduleWalk.<init>(SubmoduleWalk.java:409)
        at org.eclipse.jgit.api.FetchCommand.fetchSubmodules(FetchCommand.java:167)
        at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:247)
        at org.eclipse.jgit.api.CloneCommand.fetch(CloneCommand.java:305)
        at org.eclipse.jgit.api.CloneCommand.call(CloneCommand.java:204)
        at com.orgzly.android.repos.GitRepo.cloneRepo(GitRepo.java:149)
        at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:95)
        at com.orgzly.android.repos.GitRepo.ensureRepositoryExists(GitRepo.java:85)
        at com.orgzly.android.ui.repo.git.GitRepoActivity$RepoCloneTask.doInBackground(GitRepoActivity.kt:447)
        at com.orgzly.android.ui.repo.git.GitRepoActivity$RepoCloneTask.doInBackground(GitRepoActivity.kt:436)
        at android.os.AsyncTask$2.call(AsyncTask.java:333)
        at java.util.concurrent.FutureTask.run(FutureTask.java:266)
        at android.os.AsyncTask$SerialExecutor$1.run(AsyncTask.java:245) 
        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1167) 
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:641) 
        at java.lang.Thread.run(Thread.java:764) 

Found during testing/changes from @amberin

• [ ] Changing the storage location for a repo makes the repo unusable What behaviour do we want here? Should we just copy the repo to the new location or not allow location changing at all for the first release of the feature?

• [x] mtime correction I'm not sure what this is related to, could you fill med in @amberin?

• [ ] Change how conflict resolution is handled, push the conflicting merge branch to remote to allow fixing it somewhere else and then allow "force-pulling" a notebook. This probably doesn't fit in this PR but I wanted to remember it.

This is a work in progress for fixing #76.

I've added a new relationship note_content_times and modified Provider.loadBookFromReader to populate the table.

I guess the next step is to update this table whenever the content changes, and to cleanup when the note is destroyed.

Then, we should be able to lookup in this table for agenda searches and reminders.

Am I on the right track? Don't be afraid to tell me if not. :)

Fixes #62.

Features:

• can select a search
• button for adding a new note
• autoupdates every minute
• updates on most of the common actions (saving, marking as done and some other ones)
• mark as done button for TODO items

Missing:

• [x] preview image
• [x] tests

There are some points, which are not ideal, maybe you have an idea, @nevenz, how these can be solved:

• AppWidgets don't support themes, so I had to copy a lot of the information from the default theme
• I had to copy quite a bit of code from the HeadListViewAdapter, because I could not use it directly. But I also refactored it a little bit and extracted at least the title generation.

I know somebody requested to change the save icon to distinguish it from the DONE one, but the new one is quite weird also, looks like send or share... What about a check inside a white circle to match the also circled x?

Anyway the new icons are much more "solid" than most other icons in orgzly, maybe a couple of more outlined close/save ones are in order. If you tell me the icon set you are using maybe I could take a look for suggestions. I use Nerd Fonts a lot, is it possible for you to use their glyphs?

• I have searched for existing issues that may be the same as or related to mine.

It is possible to define a TODO sequence for a particular heading using the "TODO" property. I can define one such a sequence of TODOs in the orgzly settings, but I have multiple, defined in notebooks, or sometimes in a single headline.

It would be nice to have orgzly not tell me that I have work to do because it doesn't understand that "MERGE" means that my work is done, for example.

• I have searched for existing issues that may be the same as or related to mine: Yes

It would be very convenient if I could simply type out stars and Orgzly would write them without commenting, so that upon next sync they would turn into subheadings - this would greatly ease writing out notes from a keyboard and create a feel more similar to Emacs.

I have searched for existing issues that may be the same as or related to mine: Yes

When using a bluetooth keyboard, I can navigate between fields using TAB, but I have not found a way to actually enter the content field and start typing without tapping on the screen, which is rather inconvenient.

I have searched for existing issues that may be the same as or related to mine: Yes

I moved my org file folder, and now it is quite annoying having to check on and move all the notebooks, as it says:

• "Link and remote notebook exist but notebook hasn't been synced before"
• "Notebook has no link and one or more remote notebooks with the same name exist"

For both of these, content equality could be checked and the link automatically recovered.

This is primarily an Android 13 / "Material You" detail (reference). The monochrome option is just the existing foreground icon with extraneous detail tidied up.

Before:

After:

This allows the user to easily set up a new "origin" remote (by initalizing an empty repository) if the current one is somehow lost.

A Git repo which is synced between two locations should have a degree of redundancy. Without this code, there is no convenient way to sync the repo contents using Orgzly as the source.