cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 2 Projects 2 Releases 28 Wiki Activity

Merge branch 'trunk' into macNotifications
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Dan Ballard 2022-02-23 19:33:29 +00:00
parent 152f5fbc96 9473acd438
commit 5b4778dd78
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
View File

@ -218,7 +218,7 @@ class MainActivity: FlutterActivity() {
WorkManager.getInstance(this).enqueue(workRequest)
WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
this, Observer { workInfo ->
if (workInfo.state == WorkInfo.State.SUCCEEDED) {
if (workInfo != null && workInfo.state == WorkInfo.State.SUCCEEDED) {
val res = workInfo.outputData.keyValueMap.toString()
result.success(workInfo.outputData.getString("result"))
}

2
lib/views/globalsettingsview.dart
View File

@ -140,6 +140,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
trailing: Container(
width: MediaQuery.of(context).size.width / 4,
child: DropdownButton(
isExpanded: true,
value: settings.uiColumnModeLandscape.toString(),
onChanged: (String? newValue) {
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
@ -197,6 +198,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
trailing: Container(
width: MediaQuery.of(context).size.width / 4,
child: DropdownButton(
isExpanded: true,
value: settings.notificationContent,
onChanged: (NotificationContent? newValue) {
settings.notificationContent = newValue!;

2
lib/views/peersettingsview.dart
View File

@ -57,7 +57,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
String? acnCircuit = Provider.of<ContactInfoState>(context).acnCircuit;
Widget path = Text(Provider.of<ContactInfoState>(context, listen: false).status);
Widget path = Text(Provider.of<ContactInfoState>(context).status);
if (acnCircuit != null) {
var hops = acnCircuit.split(",");

4
lib/widgets/filebubble.dart
View File

@ -80,6 +80,8 @@ class FileBubbleState extends State<FileBubble> {
var downloadActive = Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey());
var downloadGotManifest = Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey());
var messageStatusWidget = MessageBubbleDecoration(ackd: metadata.ackd, errored: metadata.error, prettyDate: prettyDate, fromMe: fromMe);
// If the sender is not us, then we want to give them a nickname...
var senderDisplayStr = "";
var senderIsContact = false;
@ -195,7 +197,7 @@ class FileBubbleState extends State<FileBubble> {
crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations]),
children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations, messageStatusWidget]),
));
});
}