mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Android: Make the "Open webapp" menu item open the just created repository when a new repo is made.

Browse source
This commit is contained in:
Joey Hess 2013-06-10 23:16:18 -04:00
parent 7ccbd77b6a
commit c46b263fde
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Threads/WebApp.hs
View file

@ -51,7 +51,7 @@ webAppThread
-> UrlRenderer -> UrlRenderer
-> Bool -> Bool
-> Maybe HostName -> Maybe HostName
-> Maybe (IO String) -> Maybe (IO Url)
-> Maybe (Url -> FilePath -> IO ()) -> Maybe (Url -> FilePath -> IO ())
-> NamedThread -> NamedThread
webAppThread assistantdata urlrenderer noannex listenhost postfirstrun onstartup = thread $ liftIO $ do webAppThread assistantdata urlrenderer noannex listenhost postfirstrun onstartup = thread $ liftIO $ do

16
Command/WebApp.hs
View file

@ -157,15 +157,25 @@ firstRun listenhost = do
Annex.eval state $ Annex.eval state $
startDaemon True True listenhost $ Just $ startDaemon True True listenhost $ Just $
sendurlback v sendurlback v
sendurlback v _origout _origerr url _htmlshim = putMVar v url sendurlback v _origout _origerr url _htmlshim = do
recordUrl url
putMVar v url
recordUrl :: String -> IO ()
#ifdef __ANDROID__
{- The Android app has a menu item that opens the url recorded
- in this file. -}
recordUrl url = writeFile "/sdcard/git-annex.home/.git-annex-url" url
#else
recordUrl _ = noop
#endif
openBrowser :: Maybe FilePath -> FilePath -> String -> Maybe Handle -> Maybe Handle -> IO () openBrowser :: Maybe FilePath -> FilePath -> String -> Maybe Handle -> Maybe Handle -> IO ()
#ifndef __ANDROID__ #ifndef __ANDROID__
openBrowser mcmd htmlshim _realurl outh errh = runbrowser openBrowser mcmd htmlshim _realurl outh errh = runbrowser
#else #else
openBrowser mcmd htmlshim realurl outh errh = do openBrowser mcmd htmlshim realurl outh errh = do
{- The Android app has a menu item that opens this file. -} recordUrl url
writeFile "/sdcard/git-annex.home/.git-annex-url" url
{- Android's `am` command does not work reliably across the {- Android's `am` command does not work reliably across the
- wide range of Android devices. Intead, FIFO should be set to - wide range of Android devices. Intead, FIFO should be set to
- the filename of a fifo that we can write the URL to. -} - the filename of a fifo that we can write the URL to. -}

2
debian/changelog vendored
View file

@ -5,6 +5,8 @@ git-annex (4.20130602) UNRELEASED; urgency=low
symlinks and other POSIX filesystem features. symlinks and other POSIX filesystem features.
* Android: Add .thumbnails to .gitignore when setting up a camera * Android: Add .thumbnails to .gitignore when setting up a camera
repository. repository.
* Android: Make the "Open webapp" menu item open the just created
repository when a new repo is made.
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400 -- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400

2
doc/bugs/Open_webapp_ask_to_create_new_repo___40__on_first_start__41___even_if_repo_exists_on_Android.mdwn
View file

@ -36,3 +36,5 @@ add Camera/IMG_20130223_111411.jpg (checksum...) ok
[...] [...]
[2013-06-01 17:14:17 EDT] Committer: Committing changes to git [2013-06-01 17:14:17 EDT] Committer: Committing changes to git
"""]] """]]
> [[fixed|done]] --[[Joey]]