fix username handling for special characters

fastlane/metadata/android/en-US/changelogs/1603.txt

@@ -0,0 +1 @@
+- fix username handling with special characters

lib/services/isolateable/nextcloud_service.dart

@@ -12,6 +12,7 @@ import 'package:yaga/utils/forground_worker/isolateable.dart';
 import 'package:yaga/utils/forground_worker/messages/init_msg.dart';
 import 'package:yaga/utils/logger.dart';
 import 'package:yaga/utils/nextcloud_client_factory.dart';
+import 'package:yaga/utils/uri_utils.dart';
 
 class NextCloudService
     with Service<NextCloudService>, Isolateable<NextCloudService>
@@ -50,7 +51,7 @@ class NextCloudService
 
   @override
   Stream<NcFile> list(Uri dir) {
-    String basePath = "files/${_client.username}";
+    String basePath = "files/${this.username}";
     return this
         ._client
         .webDav
@@ -61,11 +62,7 @@ class NextCloudService
             (event) => event.isDirectory || event.mimeType.startsWith("image"))
         .map((webDavFile) {
       var path = webDavFile.path.replaceFirst("/$basePath", "");
-      Uri uri = Uri(
-          scheme: this.scheme,
-          userInfo: _client.username,
-          host: _host.host,
-          path: path);
+      Uri uri = UriUtils.fromUri(uri: getOrigin(), path: path);
 
       NcFile file = NcFile(uri);
       file.isDirectory = webDavFile.isDirectory;
@@ -84,7 +81,7 @@ class NextCloudService
   Future<Uint8List> getAvatar() => this
       ._client
       .avatar
-      .getAvatar(_client.username, 100)
+      .getAvatar(this.username, 100)
       .then((value) => base64.decode(value));
 
   Future<Uint8List> getPreview(Uri file) {
@@ -101,14 +98,14 @@ class NextCloudService
 
   Future<Uint8List> downloadImage(Uri file) {
     String basePath =
-        "files/${_client.username}"; //todo: add proper logging and check if download gets called on real device multiple times
+        "files/${this.username}"; //todo: add proper logging and check if download gets called on real device multiple times
     return this._client.webDav.download(basePath + file.path);
   }
 
   Uri getOrigin() {
     return Uri(
         scheme: this.scheme,
-        userInfo: _client.username,
+        userInfo: Uri.encodeComponent(this.username),
         host: _host.host,
         path: "/");
   }

lib/views/screens/browse_view.dart

@@ -50,11 +50,12 @@ class BrowseView extends StatelessWidget {
             if (getIt.get<NextCloudService>().isLoggedIn()) {
               Uri origin = getIt.get<NextCloudService>().getOrigin();
               children.add(ListTile(
-                isThreeLine: false,
+                isThreeLine: true,
                 leading: AvatarWidget.command(
                   getIt.get<NextCloudManager>().updateAvatarCommand,
                 ),
-                title: Text(origin.authority),
+                title: Text(getIt.get<NextCloudService>().username),
+                subtitle: Text(origin.host),
                 onTap: () => getIt
                     .get<NavigationManager>()
                     .showDirectoryNavigation(_getArgs(context, origin)),

lib/views/screens/nc_login_screen.dart

@@ -44,7 +44,7 @@ class NextCloudLoginScreen extends StatelessWidget {
 
               getIt.get<NextCloudManager>().loginCommand(NextCloudLoginData(
                   Uri.parse(ncParas[NextCloudLoginDataKeys.server]),
-                  ncParas[NextCloudLoginDataKeys.user],
+                  Uri.decodeComponent(ncParas[NextCloudLoginDataKeys.user]),
                   ncParas[NextCloudLoginDataKeys.password]));
 
               Navigator.popUntil(

lib/views/widgets/preferences/uri_preference_widget.dart

@@ -52,7 +52,7 @@ class UriPreferenceWidget extends StatelessWidget {
       listTileBuilder: (context, pref) => ListTile(
         enabled: pref.enabled,
         title: Text(pref.title),
-        subtitle: Text(pref.value.toString()),
+        subtitle: Text(Uri.decodeComponent(pref.value.toString())),
         onTap: () => _pushToNavigation(context, pref, pref.value),
       ),
     );

pubspec.yaml

@@ -11,7 +11,7 @@ description: A Nextcloud gallary app.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.16.2+1602
+version: 0.16.3+1603
 
 environment:
   sdk: ">=2.7.0 <3.0.0"