Merge branch 'master' into Translation/Crowdin

# Conflicts:
#	lib/l10n/app_zh.arb

Author: remi-martin

README.md

@@ -10,7 +10,7 @@ If you face trouble please [create tickets](https://github.com/Piwigo/piwigo-flu
 
 # Installation
 
-For now, this application is in Beta. You can download the latest version either from Github or from Google Play Store:
+You can download the latest version either from Github or from Google Play Store:
 
 ## Download from Play Store
 
@@ -87,7 +87,7 @@ With Piwigo NG, you can upload images from the phone.
 
 # Flutter
 
-This application is made with [Google's Flutter](https://flutter.dev/?gclid=Cj0KCQjwvYSEBhDjARIsAJMn0lj-G1Ly0oznQeMGvyTYBY2TZfxFpkb9WYp4dsyMSwKIUsmTwE-SltIaAsjFEALw_wcB&gclsrc=aw.ds)
+This application is made with [Flutter](https://flutter.dev/?gclid=Cj0KCQjwvYSEBhDjARIsAJMn0lj-G1Ly0oznQeMGvyTYBY2TZfxFpkb9WYp4dsyMSwKIUsmTwE-SltIaAsjFEALw_wcB&gclsrc=aw.ds)
 
 A UI toolkit for building beautiful, natively compiled applications for [mobile](https://flutter.dev/docs), [web](https://flutter.dev/web), and [desktop](https://flutter.dev/desktop) from a single codebase.
 
@@ -105,4 +105,4 @@ For the upload, we are using the **uploadAsync** method of the API. This method
 # Licence
 
 Piwigo is a free software, it can be redistributed it and / or modified under the terms of the GNU General Public License
-[see more here](./LICENCE.txt)
+[see more here](./LICENCE.txt)

android/app/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.remi.piwigo_ng">
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
    <application
-        android:label="piwigo_ng"
+        android:label="Piwigo NG"
         android:usesCleartextTraffic="true"
         android:requestLegacyExternalStorage="true"
         android:icon="@mipmap/ic_launcher">
@@ -27,20 +27,12 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -52,12 +44,20 @@
         <!-- If your app opens https URLs -->
         <intent>
             <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https" />
         </intent>
-        <!-- If your app makes calls -->
         <intent>
             <action android:name="android.intent.action.DIAL" />
             <data android:scheme="tel" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="sms" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.SEND" />
+            <data android:mimeType="*/*" />
+        </intent>
     </queries>
 </manifest>

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         jcenter()

android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.jetifier.blacklist=bcprov-jdk15on

lib/api/API.dart

@@ -4,6 +4,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:piwigo_ng/services/upload/Uploader.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
 class API {
   static final API _singleton = API._internal();
@@ -12,6 +13,7 @@ class API {
   static CookieJar cookieJar = CookieJar();
   static Uploader uploader;
   static SharedPreferences prefs;
+  static final storage = FlutterSecureStorage();
   static FlutterLocalNotificationsPlugin localNotification;
 
   factory API() {

lib/api/CategoryAPI.dart

@@ -1,16 +1,62 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
 import 'API.dart';
+import 'SessionAPI.dart';
 
 Future<Map<String,dynamic>> fetchAlbums(String albumID) async {
-
-  Map<String, String> queries = {
+  Map<String, dynamic> queries = {
     "format": "json",
     "method": "pwg.categories.getList",
     "cat_id": albumID,
     "thumbnail_size": API.prefs.getString('thumbnail_size'),
   };
+  List<String> uploadCategoryIdList = [];
+  if (await methodExist('community.categories.getList')) {
+    queries['faked_by_community'] = false;
+    var communityResult = await fetchCommunityAlbums(albumID);
+    uploadCategoryIdList = communityResult['result']['categories'].map<String>(
+      (cat) => cat['id'].toString(),
+    ).toList();
+  }
+
+  try {
+    Response response = await API().dio.get('ws.php', queryParameters: queries);
+
+    if (response.statusCode == 200) {
+      Map<String, dynamic> result = json.decode(response.data);
+      if(result['stat'] == 'fail') return result;
+      var categoryList = result['result']['categories'];
+      for (var cat in categoryList) {
+        bool canUpload = false;
+        if (!['normal', 'guest'].contains(API.prefs.getString('user_status'))
+            || uploadCategoryIdList.contains(cat['id'].toString())) {
+          canUpload = true;
+        }
+        cat['can_upload'] = canUpload;
+      }
+      result['result']['categories'] = categoryList;
+      return result;
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } on DioError {
+    return {
+      'stat': 'fail',
+      'result': 'error',
+    };
+  }
+}
+Future<Map<String,dynamic>> fetchCommunityAlbums(String albumID) async {
+  Map<String, dynamic> queries = {
+    "format": "json",
+    "method": "community.categories.getList",
+    "cat_id": albumID,
+  };
 
   try {
     Response response = await API().dio.get('ws.php', queryParameters: queries);
@@ -24,10 +70,10 @@ Future<Map<String,dynamic>> fetchAlbums(String albumID) async {
       };
     }
   } catch(e) {
-    //var error = e as DioError;
+    var error = e as DioError;
     return {
       'stat': 'fail',
-      'result': e.toString(),
+      'result': error.message,
     };
   }
 }
@@ -76,8 +122,7 @@ Future<dynamic> addCategory(String catName, String catDesc, String parent) async
         'result': response.statusMessage
       };
     }
-  } catch(e) {
-    var error = e as DioError;
+  } on DioError catch(error) {
     return {
       'stat': 'fail',
       'result': error.message
@@ -170,7 +215,7 @@ Future<dynamic> editCategory(int catId, String catName, String catDesc) async {
       return json.decode(response.data);
     }
   } catch (e) {
-    print('Dio move category error $e');
+    debugPrint('Dio move category error $e');
     return e;
   }
 }