android/app/build.gradle

@@ -89,7 +89,8 @@ dependencies {
     implementation project(':cwtch')
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
-    implementation "com.airbnb.android:lottie:3.5.0"
+    implementation "com.airbnb.android:lottie:4.2.1"
+    implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
     implementation "com.android.support.constraint:constraint-layout:2.0.4"
 
     // WorkManager

android/build.gradle

@@ -2,7 +2,8 @@ buildscript {
     ext.kotlin_version = '1.3.50'
     repositories {
         google()
-        jcenter()
+        // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown
+        mavenCentral()
     }
 
     dependencies {
@@ -15,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

lib/views/addcontactview.dart

@@ -52,11 +52,7 @@ class _AddContactViewState extends State<AddContactView> {
 
     /// We display a different number of tabs depending on the experiment setup
     bool groupsEnabled = Provider.of<Settings>(context).isExperimentEnabled(TapirGroupsExperiment);
-    return Scrollbar(
+    return Consumer<ErrorHandler>(builder: (context, globalErrorHandler, child) {
-        isAlwaysShown: true,
-        child: SingleChildScrollView(
-            clipBehavior: Clip.antiAlias,
-            child: Consumer<ErrorHandler>(builder: (context, globalErrorHandler, child) {
       return DefaultTabController(
           length: groupsEnabled ? 2 : 1,
           child: Column(children: [
@@ -71,7 +67,7 @@ class _AddContactViewState extends State<AddContactView> {
                   : [addPeerTab()]),
             )),
           ]));
-            })));
+    });
   }
 
   void _copyOnion() {
@@ -109,7 +105,10 @@ class _AddContactViewState extends State<AddContactView> {
   /// The Add Peer Tab allows a peer to add a specific non-group peer to their contact lists
   /// We also provide a convenient way to copy their onion.
   Widget addPeerTab() {
-    return Container(
+    return Scrollbar(
+        child: SingleChildScrollView(
+            clipBehavior: Clip.antiAlias,
+            child: Container(
                 margin: EdgeInsets.all(30),
                 padding: EdgeInsets.all(20),
                 child: Form(
@@ -169,7 +168,7 @@ class _AddContactViewState extends State<AddContactView> {
                         },
                         hintText: '',
                       )
-            ])));
+                    ])))));
   }
 
   /// TODO Add Group Pane
@@ -179,7 +178,10 @@ class _AddContactViewState extends State<AddContactView> {
       return Text(AppLocalizations.of(context)!.addServerFirst);
     }
 
-    return Container(
+    return Scrollbar(
+        child: SingleChildScrollView(
+            clipBehavior: Clip.antiAlias,
+            child: Container(
                 margin: EdgeInsets.all(30),
                 padding: EdgeInsets.all(20),
                 child: Form(
@@ -243,7 +245,7 @@ class _AddContactViewState extends State<AddContactView> {
                           child: Text(AppLocalizations.of(context)!.createGroupBtn),
                         ),
                       ],
-            )));
+                    )))));
   }
 
   /// TODO Manage Servers Tab

lib/views/torstatusview.dart

@@ -106,14 +106,10 @@ class _TorStatusView extends State<TorStatusView> {
                                             if (port > 0 && port < 65536) {
                                               return null;
                                             } else {
-                                              return AppLocalizations.of(
+                                              return AppLocalizations.of(context)!.torSettingsErrorSettingPort;
-                                                  context)!
-                                                  .torSettingsErrorSettingPort;
                                             }
-                                          }catch (e) {
+                                          } catch (e) {
-                                            return AppLocalizations.of(
+                                            return AppLocalizations.of(context)!.torSettingsErrorSettingPort;
-                                                context)!
-                                                .torSettingsErrorSettingPort;
                                           }
                                         },
                                         onChanged: (String socksPort) {
@@ -141,22 +137,17 @@ class _TorStatusView extends State<TorStatusView> {
                                             if (port > 0 && port < 65536) {
                                               return null;
                                             } else {
-                                              return AppLocalizations.of(
+                                              return AppLocalizations.of(context)!.torSettingsErrorSettingPort;
-                                                  context)!
-                                                  .torSettingsErrorSettingPort;
                                             }
-                                          }catch (e) {
+                                          } catch (e) {
-                                            return AppLocalizations.of(
+                                            return AppLocalizations.of(context)!.torSettingsErrorSettingPort;
-                                                context)!
-                                                .torSettingsErrorSettingPort;
                                           }
                                         },
                                         onChanged: (String controlPort) {
                                           try {
                                             var port = int.parse(controlPort);
                                             if (port > 0 && port < 65536) {
-                                              settings.controlPort =
+                                              settings.controlPort = int.parse(controlPort);
-                                                  int.parse(controlPort);
                                               saveSettings(context);
                                             }
                                           } catch (e) {}

lib/widgets/textfield.dart

@@ -51,9 +51,7 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
             : widget.number
                 ? TextInputType.number
                 : TextInputType.text,
-        inputFormatters: widget.number ? <TextInputFormatter>[
+        inputFormatters: widget.number ? <TextInputFormatter>[FilteringTextInputFormatter.digitsOnly] : null,
-          FilteringTextInputFormatter.digitsOnly
-        ] : null,
         maxLines: widget.multiLine ? null : 1,
         scrollController: _scrollController,
         enableIMEPersonalizedLearning: false,
@@ -66,11 +64,7 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
             focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0)),
             focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
             errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 3.0)),
-            errorStyle: TextStyle(
+            errorStyle: TextStyle(color: theme.current().textfieldErrorColor, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),
-              color: theme.current().textfieldErrorColor,
-              fontWeight: FontWeight.bold,
-              overflow: TextOverflow.visible
-            ),
             fillColor: theme.current().textfieldBackgroundColor,
             contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
             enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(15.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 3.0))),