Hide "Current Password" field for password-less accounts

LIBCWTCH-GO.version

@@ -1 +1 @@
-v0.0.2-104-gc1b7e4c-2021-06-22-23-59
+v0.0.2-106-g69f14f9-2021-06-24-15-49

lib/cwtch/cwtchNotifier.dart

@@ -37,7 +37,8 @@ class CwtchNotifier {
         appState.SetAppError(data["Error"]);
         break;
       case "NewPeer":
-        profileCN.add(data["Identity"], data["name"], data["picture"], data["ContactsJson"], data["ServerList"], data["Online"] == "true");
+        // if tag != v1-defaultPassword then it is either encrypted OR it is an unencrypted account created during pre-beta...
+        profileCN.add(data["Identity"], data["name"], data["picture"], data["ContactsJson"], data["ServerList"], data["Online"] == "true", data["tag"] != "v1-defaultPassword");
         break;
       case "PeerCreated":
         profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(

lib/model.dart

@@ -38,10 +38,10 @@ class ProfileListState extends ChangeNotifier {
   List<ProfileInfoState> _profiles = [];
   int get num => _profiles.length;
 
-  void add(String onion, String name, String picture, String contactsJson, String serverJson, bool online) {
+  void add(String onion, String name, String picture, String contactsJson, String serverJson, bool online, bool encrypted) {
     var idx = _profiles.indexWhere((element) => element.onion == onion);
     if (idx == -1) {
-      _profiles.add(ProfileInfoState(onion: onion, nickname: name, imagePath: picture, contactsJson: contactsJson, serversJson: serverJson, online: online));
+      _profiles.add(ProfileInfoState(onion: onion, nickname: name, imagePath: picture, contactsJson: contactsJson, serversJson: serverJson, online: online, encrypted: encrypted));
     } else {
       _profiles[idx].updateFrom(onion, name, picture, contactsJson, serverJson, online);
     }
@@ -177,6 +177,10 @@ class ProfileInfoState extends ChangeNotifier {
   int _unreadMessages = 0;
   bool _online = false;
 
+  // assume profiles are encrypted...this will be set to false
+  // in the constructor if the profile is encrypted with the defacto password.
+  bool _encrypted = true;
+
   ProfileInfoState({
     required this.onion,
     nickname = "",
@@ -185,11 +189,13 @@ class ProfileInfoState extends ChangeNotifier {
     contactsJson = "",
     serversJson = "",
     online = false,
+    encrypted = true,
   }) {
     this._nickname = nickname;
     this._imagePath = imagePath;
     this._unreadMessages = unreadMessages;
     this._online = online;
+    this._encrypted = encrypted;
 
     if (contactsJson != null && contactsJson != "" && contactsJson != "null") {
       List<dynamic> contacts = jsonDecode(contactsJson);
@@ -243,6 +249,9 @@ class ProfileInfoState extends ChangeNotifier {
     notifyListeners();
   }
 
+  // Check encrypted status for profile info screen
+  bool get isEncrypted => this._encrypted;
+
   String get nickname => this._nickname;
   set nickname(String newValue) {
     this._nickname = newValue;

lib/views/addeditprofileview.dart

@@ -155,7 +155,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                                 visible: usePassword,
                                 child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
                                   Visibility(
-                                      visible: Provider.of<ProfileInfoState>(context, listen: false).onion.isNotEmpty,
+                                      visible: Provider.of<ProfileInfoState>(context, listen: false).onion.isNotEmpty && Provider.of<ProfileInfoState>(context).isEncrypted,
                                       child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
                                         CwtchLabel(label: AppLocalizations.of(context)!.currentPasswordLabel),
                                         SizedBox(
@@ -165,7 +165,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
                                           controller: ctrlrOldPass,
                                           validator: (value) {
                                             // Password field can be empty when just updating the profile, not on creation
-                                            if (Provider.of<ProfileInfoState>(context, listen: false).onion.isEmpty && value.isEmpty && usePassword) {
+                                            if (Provider.of<ProfileInfoState>(context).isEncrypted && Provider.of<ProfileInfoState>(context, listen: false).onion.isEmpty && value.isEmpty && usePassword) {
                                               return AppLocalizations.of(context)!.passwordErrorEmpty;
                                             }
                                             if (Provider.of<ErrorHandler>(context).deleteProfileError == true) {

lib/widgets/profilerow.dart

@@ -72,7 +72,7 @@ class _ProfileRowState extends State<ProfileRow> {
                 tooltip: AppLocalizations.of(context)!.editProfile + " " + profile.nickname,
                 icon: Icon(Icons.create, color: Provider.of<Settings>(context).current().mainTextColor()),
                 onPressed: () {
-                  _pushAddEditProfile(onion: profile.onion, displayName: profile.nickname, profileImage: profile.imagePath);
+                  _pushAddEditProfile(onion: profile.onion, displayName: profile.nickname, profileImage: profile.imagePath, encrypted: profile.isEncrypted);
                 },
               )
             ],
@@ -113,13 +113,13 @@ class _ProfileRowState extends State<ProfileRow> {
     );
   }
 
-  void _pushAddEditProfile({onion: "", displayName: "", profileImage: ""}) {
+  void _pushAddEditProfile({onion: "", displayName: "", profileImage: "", encrypted: true}) {
     Navigator.of(context).push(MaterialPageRoute<void>(
       builder: (BuildContext context) {
         return MultiProvider(
           providers: [
             ChangeNotifierProvider<ProfileInfoState>(
-              create: (_) => ProfileInfoState(onion: onion, nickname: displayName, imagePath: profileImage),
+              create: (_) => ProfileInfoState(onion: onion, nickname: displayName, imagePath: profileImage, encrypted: encrypted),
             ),
           ],
           builder: (context, widget) => AddEditProfileView(),

linux/flutter/generated_plugin_registrant.cc

@@ -6,10 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <window_size/window_size_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) window_size_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "WindowSizePlugin");
-  window_size_plugin_register_with_registrar(window_size_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  window_size
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

pubspec.lock

@@ -1,6 +1,13 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   args:
     dependency: transitive
     description:
@@ -133,6 +140,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
+  injector:
+    dependency: transitive
+    description:
+      name: injector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   intl:
     dependency: transitive
     description:
@@ -161,6 +175,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.0"
+  msix:
+    dependency: "direct dev"
+    description:
+      name: msix
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   nested:
     dependency: transitive
     description:
@@ -182,6 +203,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -390,6 +418,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.1.2"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.0"
 sdks:
   dart: ">=2.13.0 <3.0.0"
   flutter: ">=1.20.0"

windows/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <window_size/window_size_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  WindowSizePluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("WindowSizePlugin"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  window_size
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)