fix for Android

Assistant/XMPP/Git.hs

@@ -92,8 +92,7 @@ xmppPush cid gitpush handledeferred = runPush SendPack cid handledeferred $ do
 	(readpush, Fd outf) <- liftIO createPipe
 	(Fd controlf, writecontrol) <- liftIO createPipe
 
-	tmp <- liftAnnex $ fromRepo gitAnnexTmpDir
+	tmpdir <- gettmpdir
-	let tmpdir = tmp </> "xmppgit"
 	installwrapper tmpdir
 
 	env <- liftIO getEnvironment
@@ -160,6 +159,17 @@ xmppPush cid gitpush handledeferred = runPush SendPack cid handledeferred $ do
 			, "exec " ++ program ++ " xmppgit"
 			]
 		modifyFileMode wrapper $ addModes executeModes
+	{- Use GIT_ANNEX_TMP_DIR if set, since that may be a better temp
+	 - dir (ie, not on a crippled filesystem where we can't make
+	 - the wrapper executable). -}
+	gettmpdir = do
+		v <- liftIO $ getEnv "GIT_ANNEX_TMP_DIR"
+		case v of
+			Nothing -> do
+				tmp <- liftAnnex $ fromRepo gitAnnexTmpDir
+				return $ tmp </> "xmppgit"
+			Just d -> return $ d </> "xmppgit"
+				
 
 type EnvVar = String
 

doc/design/assistant/android.mdwn

@@ -4,7 +4,8 @@ to improve it.
 ## high-priority TODO
 
 * [[bugs/Android_app_permission_denial_on_startup]]
-* S3 doesn't work
+* S3 doesn't work (at least to Internet Archive: 
+  "connect: does not exist (connection refused)")
 
 ## TODO