removed the old Android app
Running git-annex linux builds in termux seems to work well enough that the only reason to keep the Android app would be to support Android 4-5, which the old Android app supported, and which I don't know if the termux method works on (although I see no reason why it would not). According to [1], Android 4-5 remains on around 29% of devices, down from 51% one year ago. [1] https://www.statista.com/statistics/271774/share-of-android-platforms-on-mobile-devices-with-android-os/ This is a rather large commit, but mostly very straightfoward removal of android ifdefs and patches and associated cruft. Also, removed support for building with very old ghc < 8.0.1, and with yesod < 1.4.3, and without concurrent-output, which were only being used by the cross build. Some documentation specific to the Android app (screenshots etc) needs to be updated still. This commit was sponsored by Brett Eisenberg on Patreon.
This commit is contained in:
parent
aaa841e60a
commit
38d691a10f
124 changed files with 81 additions and 12472 deletions
|
@ -165,13 +165,8 @@ postFirstRepositoryR :: Handler Html
|
|||
postFirstRepositoryR = page "Getting started" (Just Configuration) $ do
|
||||
unlessM (liftIO $ inPath "git") $
|
||||
giveup "You need to install git in order to use git-annex!"
|
||||
#ifdef __ANDROID__
|
||||
androidspecial <- liftIO $ doesDirectoryExist "/sdcard/DCIM"
|
||||
let path = "/sdcard/annex"
|
||||
#else
|
||||
androidspecial <- liftIO osAndroid
|
||||
path <- liftIO . defaultRepositoryPath =<< liftH inFirstRun
|
||||
#endif
|
||||
((res, form), enctype) <- liftH $ runFormPostNoToken $ newRepositoryForm path
|
||||
case res of
|
||||
FormSuccess (RepositoryPath p) -> liftH $
|
||||
|
@ -180,12 +175,8 @@ postFirstRepositoryR = page "Getting started" (Just Configuration) $ do
|
|||
|
||||
getAndroidCameraRepositoryR :: Handler ()
|
||||
getAndroidCameraRepositoryR = do
|
||||
#ifdef __ANDROID__
|
||||
let dcim = "/sdcard/DCIM"
|
||||
#else
|
||||
home <- liftIO myHomeDir
|
||||
let dcim = home </> "storage" </> "dcim"
|
||||
#endif
|
||||
startFullAssistant dcim SourceGroup $ Just addignore
|
||||
where
|
||||
addignore = do
|
||||
|
@ -392,10 +383,6 @@ driveList = mapM (genRemovableDrive . mnt_dir) =<< filter sane <$> getMounts
|
|||
| dir == "/tmp" = False
|
||||
| dir == "/run/shm" = False
|
||||
| dir == "/run/lock" = False
|
||||
#ifdef __ANDROID__
|
||||
| dir == "/mnt/sdcard" = False
|
||||
| dir == "/sdcard" = False
|
||||
#endif
|
||||
| otherwise = True
|
||||
#endif
|
||||
|
||||
|
|
|
@ -116,7 +116,6 @@ sshInputAForm hostnamefield d = normalize <$> gen
|
|||
bad_username textField
|
||||
|
||||
bad_username = "bad user name" :: Text
|
||||
#ifndef __ANDROID__
|
||||
bad_hostname = "cannot resolve host name" :: Text
|
||||
|
||||
check_hostname = checkM (liftIO . checkdns) hostnamefield
|
||||
|
@ -131,10 +130,6 @@ sshInputAForm hostnamefield d = normalize <$> gen
|
|||
| otherwise -> Right $ T.pack fullname
|
||||
Just [] -> Right t
|
||||
Nothing -> Left bad_hostname
|
||||
#else
|
||||
-- getAddrInfo currently broken on Android
|
||||
check_hostname = hostnamefield -- unchecked
|
||||
#endif
|
||||
|
||||
-- The directory is implicitly in home, so remove any leading ~/
|
||||
normalize i = i { inputDirectory = normalizedir <$> inputDirectory i }
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
- Licensed under the GNU AGPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
||||
{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
||||
|
||||
module Assistant.WebApp.Configurators.Upgrade where
|
||||
|
||||
|
@ -15,22 +15,11 @@ import Assistant.Upgrade
|
|||
import Assistant.Restart
|
||||
import Config
|
||||
|
||||
{- On Android, just point the user at the apk file to download.
|
||||
- Installation will be handled by selecting the downloaded file.
|
||||
-
|
||||
- Otherwise, start the upgrade process, which will run fully
|
||||
- noninteractively.
|
||||
- -}
|
||||
{- Start the upgrade process. -}
|
||||
getConfigStartUpgradeR :: GitAnnexDistribution -> Handler Html
|
||||
getConfigStartUpgradeR d = do
|
||||
#ifdef ANDROID_SPLICES
|
||||
let url = distributionUrl d
|
||||
page "Upgrade" (Just Configuration) $
|
||||
$(widgetFile "configurators/upgrade/android")
|
||||
#else
|
||||
liftAssistant $ startDistributionDownload d
|
||||
redirect DashboardR
|
||||
#endif
|
||||
|
||||
{- Finish upgrade by starting the new assistant in the same repository this
|
||||
- one is running in, and redirecting to it. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue