mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 20:07:46 +00:00
org-mobile: Remove references to "MobileOrg" specific application
* lisp/org-mobile.el (org-mobile-files): (org-mobile-use-encryption): (org-mobile-encryption-password): (org-mobile-capture-file): (org-mobile-index-file): (org-mobile-agendas): (org-mobile-action-alist): (org-mobile-edit): Remove reference to "MobileOrg" since the protocol is not tied to a specific implementation.
This commit is contained in:
parent
241eb8ea7a
commit
d99cc7fb4d
|
@ -24,12 +24,12 @@
|
||||||
;;
|
;;
|
||||||
;;; Commentary:
|
;;; Commentary:
|
||||||
;;
|
;;
|
||||||
;; This file contains the code to interact with Richard Moreland's
|
;; This file contains the code to interact with a mobile application,
|
||||||
;; iPhone application MobileOrg, as well as with the Android version
|
;; such as Richard Moreland's iPhone application MobileOrg, or the
|
||||||
;; by Matthew Jones. This code is documented in Appendix B of the Org
|
;; Android version by Matthew Jones. This code is documented in
|
||||||
;; manual. The code is not specific for the iPhone and Android - any
|
;; Appendix B of the Org manual. The code is not specific for the
|
||||||
;; external viewer/flagging/editing application that uses the same
|
;; iPhone and Android - any external viewer/flagging/editing
|
||||||
;; conventions could be used.
|
;; application that uses the same conventions could be used.
|
||||||
|
|
||||||
(require 'org)
|
(require 'org)
|
||||||
(require 'org-agenda)
|
(require 'org-agenda)
|
||||||
|
@ -45,15 +45,17 @@
|
||||||
:group 'org)
|
:group 'org)
|
||||||
|
|
||||||
(defcustom org-mobile-files '(org-agenda-files)
|
(defcustom org-mobile-files '(org-agenda-files)
|
||||||
"Files to be staged for MobileOrg.
|
"Files to be staged for the mobile application.
|
||||||
|
|
||||||
This is basically a list of files and directories. Files will be staged
|
This is basically a list of files and directories. Files will be staged
|
||||||
directly. Directories will be search for files with the extension `.org'.
|
directly. Directories will be search for files with the extension \".org\".
|
||||||
In addition to this, the list may also contain the following symbols:
|
In addition to this, the list may also contain the following symbols:
|
||||||
|
|
||||||
org-agenda-files
|
`org-agenda-files'
|
||||||
This means include the complete, unrestricted list of files given in
|
This means include the complete, unrestricted list of files given in
|
||||||
the variable `org-agenda-files'.
|
the variable `org-agenda-files'.
|
||||||
org-agenda-text-search-extra-files
|
|
||||||
|
`org-agenda-text-search-extra-files'
|
||||||
Include the files given in the variable
|
Include the files given in the variable
|
||||||
`org-agenda-text-search-extra-files'"
|
`org-agenda-text-search-extra-files'"
|
||||||
:group 'org-mobile
|
:group 'org-mobile
|
||||||
|
@ -84,12 +86,14 @@ org-agenda-text-search-extra-files
|
||||||
|
|
||||||
(defcustom org-mobile-use-encryption nil
|
(defcustom org-mobile-use-encryption nil
|
||||||
"Non-nil means keep only encrypted files on the WebDAV server.
|
"Non-nil means keep only encrypted files on the WebDAV server.
|
||||||
|
|
||||||
Encryption uses AES-256, with a password given in
|
Encryption uses AES-256, with a password given in
|
||||||
`org-mobile-encryption-password'.
|
`org-mobile-encryption-password'. When nil, plain files are kept
|
||||||
When nil, plain files are kept on the server.
|
on the server.
|
||||||
Turning on encryption requires setting the same password in the MobileOrg
|
|
||||||
application. Before turning this on, check of MobileOrg does already
|
Turning on encryption requires setting the same password in the
|
||||||
support it - at the time of this writing it did not yet."
|
mobile application. Before turning this on, check if the mobile
|
||||||
|
application does support it."
|
||||||
:group 'org-mobile
|
:group 'org-mobile
|
||||||
:version "24.1"
|
:version "24.1"
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
@ -104,9 +108,10 @@ You might want to put this file into a directory where only you have access."
|
||||||
|
|
||||||
(defcustom org-mobile-encryption-password ""
|
(defcustom org-mobile-encryption-password ""
|
||||||
"Password for encrypting files uploaded to the server.
|
"Password for encrypting files uploaded to the server.
|
||||||
|
|
||||||
This is a single password which is used for AES-256 encryption. The same
|
This is a single password which is used for AES-256 encryption. The same
|
||||||
password must also be set in the MobileOrg application. All Org files,
|
password must also be set in the mobile application. All Org files,
|
||||||
including mobileorg.org will be encrypted using this password.
|
including \"mobileorg.org\" will be encrypted using this password.
|
||||||
|
|
||||||
SECURITY CONSIDERATIONS:
|
SECURITY CONSIDERATIONS:
|
||||||
|
|
||||||
|
@ -129,7 +134,7 @@ session."
|
||||||
(or (org-string-nw-p org-mobile-encryption-password)
|
(or (org-string-nw-p org-mobile-encryption-password)
|
||||||
(org-string-nw-p org-mobile-encryption-password-session)
|
(org-string-nw-p org-mobile-encryption-password-session)
|
||||||
(setq org-mobile-encryption-password-session
|
(setq org-mobile-encryption-password-session
|
||||||
(read-passwd "Password for MobileOrg: " t))))
|
(read-passwd "Password for mobile application: " t))))
|
||||||
|
|
||||||
(defcustom org-mobile-inbox-for-pull "~/org/from-mobile.org"
|
(defcustom org-mobile-inbox-for-pull "~/org/from-mobile.org"
|
||||||
"The file where captured notes and flags will be appended to.
|
"The file where captured notes and flags will be appended to.
|
||||||
|
@ -142,23 +147,25 @@ been appended to the file given here. This file should be in
|
||||||
|
|
||||||
(defconst org-mobile-capture-file "mobileorg.org"
|
(defconst org-mobile-capture-file "mobileorg.org"
|
||||||
"The capture file where the mobile stores captured notes and flags.
|
"The capture file where the mobile stores captured notes and flags.
|
||||||
This should not be changed, because MobileOrg assumes this name.")
|
This must not be changed, because the mobile application assumes this name.")
|
||||||
|
|
||||||
(defcustom org-mobile-index-file "index.org"
|
(defcustom org-mobile-index-file "index.org"
|
||||||
"The index file with links to all Org files that should be loaded by MobileOrg.
|
"Index file with links to all Org files.
|
||||||
Relative to `org-mobile-directory'. The Address field in the MobileOrg setup
|
It should be loaded by the mobile application. The file name is
|
||||||
should point to this file."
|
relative to `org-mobile-directory'. The \"Address\" field in the
|
||||||
|
mobile application setup should point to this file."
|
||||||
:group 'org-mobile
|
:group 'org-mobile
|
||||||
:type 'file)
|
:type 'file)
|
||||||
|
|
||||||
(defcustom org-mobile-agendas 'all
|
(defcustom org-mobile-agendas 'all
|
||||||
"The agendas that should be pushed to MobileOrg.
|
"The agendas that should be pushed to the mobile application.
|
||||||
|
|
||||||
Allowed values:
|
Allowed values:
|
||||||
|
|
||||||
default the weekly agenda and the global TODO list
|
`default' the weekly agenda and the global TODO list
|
||||||
custom all custom agendas defined by the user
|
`custom' all custom agendas defined by the user
|
||||||
all the custom agendas and the default ones
|
`all' the custom agendas and the default ones
|
||||||
list a list of selection key(s) as string."
|
`list' a list of selection key(s) as string."
|
||||||
:group 'org-mobile
|
:group 'org-mobile
|
||||||
:version "24.1"
|
:version "24.1"
|
||||||
:type '(choice
|
:type '(choice
|
||||||
|
@ -229,7 +236,9 @@ using `rsync' or `scp'.")
|
||||||
|
|
||||||
(defconst org-mobile-action-alist '(("edit" . org-mobile-edit))
|
(defconst org-mobile-action-alist '(("edit" . org-mobile-edit))
|
||||||
"Alist with flags and actions for mobile sync.
|
"Alist with flags and actions for mobile sync.
|
||||||
When flagging an entry, MobileOrg will create entries that look like
|
|
||||||
|
When flagging an entry, the mobile application creates entries
|
||||||
|
that look like
|
||||||
|
|
||||||
* F(action:data) [[id:entry-id][entry title]]
|
* F(action:data) [[id:entry-id][entry title]]
|
||||||
|
|
||||||
|
@ -1037,7 +1046,9 @@ be returned that indicates what went wrong."
|
||||||
(insert new)
|
(insert new)
|
||||||
(delete-region (point) (+ (point) (length current)))
|
(delete-region (point) (+ (point) (length current)))
|
||||||
(org-align-tags))
|
(org-align-tags))
|
||||||
(t (error "Heading changed in MobileOrg and on the computer")))))))
|
(t
|
||||||
|
(error
|
||||||
|
"Heading changed in the mobile device and on the computer")))))))
|
||||||
|
|
||||||
((eq what 'addheading)
|
((eq what 'addheading)
|
||||||
(if (org-at-heading-p) ; if false we are in top-level of file
|
(if (org-at-heading-p) ; if false we are in top-level of file
|
||||||
|
@ -1090,7 +1101,8 @@ be returned that indicates what went wrong."
|
||||||
(outline-next-heading)
|
(outline-next-heading)
|
||||||
(point))))
|
(point))))
|
||||||
t)
|
t)
|
||||||
(t (error "Body was changed in MobileOrg and on the computer")))))))
|
(t (error
|
||||||
|
"Body was changed in the mobile device and on the computer")))))))
|
||||||
|
|
||||||
(defun org-mobile-tags-same-p (list1 list2)
|
(defun org-mobile-tags-same-p (list1 list2)
|
||||||
"Are the two tag lists the same?"
|
"Are the two tag lists the same?"
|
||||||
|
|
Loading…
Reference in a new issue