forked from cwtch.im/cwtch-ui
Merge pull request 'Prevent Sharing Files on Android for Now' (#194) from android-files into trunk
Reviewed-on: cwtch.im/cwtch-ui#194
This commit is contained in:
commit
d070b7141e
|
@ -231,8 +231,10 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
|
|||
val filepath = (a.get("filepath") as? String) ?: ""
|
||||
val manifestpath = (a.get("manifestpath") as? String) ?: ""
|
||||
val filekey = (a.get("filekey") as? String) ?: ""
|
||||
Log.i("FlwtchWorker::DownloadFile", "DownloadFile("+filepath+", "+manifestpath+")")
|
||||
Cwtch.downloadFile(profile, handle, filepath, manifestpath, filekey)
|
||||
// FIXME: Prevent spurious calls by Intent
|
||||
if (profile != "") {
|
||||
Cwtch.downloadFile(profile, handle, filepath, manifestpath, filekey)
|
||||
}
|
||||
}
|
||||
"CheckDownloadStatus" -> {
|
||||
val profile = (a.get("ProfileOnion") as? String) ?: ""
|
||||
|
|
|
@ -83,11 +83,13 @@ class _MessageViewState extends State<MessageView> {
|
|||
|
||||
var appBarButtons = <Widget>[];
|
||||
if (Provider.of<ContactInfoState>(context).isOnline()) {
|
||||
appBarButtons.add(IconButton(
|
||||
icon: Icon(Icons.attach_file, size: 24),
|
||||
tooltip: AppLocalizations.of(context)!.tooltipSendFile,
|
||||
onPressed: _showFilePicker,
|
||||
));
|
||||
if (Platform.isAndroid == false) {
|
||||
appBarButtons.add(IconButton(
|
||||
icon: Icon(Icons.attach_file, size: 24),
|
||||
tooltip: AppLocalizations.of(context)!.tooltipSendFile,
|
||||
onPressed: _showFilePicker,
|
||||
));
|
||||
}
|
||||
appBarButtons.add(IconButton(
|
||||
icon: Icon(CwtchIcons.send_invite, size: 24),
|
||||
tooltip: AppLocalizations.of(context)!.sendInvite,
|
||||
|
|
Loading…
Reference in New Issue