From 137de57e83d6eec314449c5f07dcaa797a466f7d Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 16 Feb 2022 13:43:46 -0800 Subject: [PATCH 1/2] Check WorkInfo is Null This shouldn't happen in normal use, but can happen in debug builds --- android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt b/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt index 2663f54c..be363968 100644 --- a/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt +++ b/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt @@ -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.25.1 From 705b6e02c976346e3838379bc53189241064b20c Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 16 Feb 2022 13:49:29 -0800 Subject: [PATCH 2/2] Fix overlap in debug settings --- lib/views/globalsettingsview.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart index f7d040bd..3a1cd83d 100644 --- a/lib/views/globalsettingsview.dart +++ b/lib/views/globalsettingsview.dart @@ -140,6 +140,7 @@ class _GlobalSettingsViewState extends State { 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 { trailing: Container( width: MediaQuery.of(context).size.width / 4, child: DropdownButton( + isExpanded: true, value: settings.notificationContent, onChanged: (NotificationContent? newValue) { settings.notificationContent = newValue!; -- 2.25.1