Merge pull request #2 from Piwigo/master

updating

Author: abrenoch

LICENCE.txt

@@ -100,3 +100,9 @@ The connection to the server is made with the Piwigo's API.
 ## Upload
 
 For the upload, we are using the **uploadAsync** method of the API. This method requires to **chunk** the image with a size given by the server. All chunks are uploaded simultaneously and reorganized by the server.
+
+
+# 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)

README.md

@@ -7,12 +7,13 @@
     <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">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -26,15 +27,6 @@
               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"/>

android/app/src/main/AndroidManifest.xml

@@ -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/API.dart

@@ -24,10 +24,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,
     };
   }
 }

lib/api/CategoryAPI.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:ext_storage/ext_storage.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:path_provider/path_provider.dart';
@@ -76,7 +75,6 @@ Future<dynamic> getImageInfo(int imageId) async {
 
 Future<bool> _requestPermissions() async {
   var permission = await Permission.storage.status;
-  print(permission.isGranted);
   if (permission != PermissionStatus.granted) {
     await Permission.storage.request();
     permission = await Permission.storage.status;
@@ -176,7 +174,6 @@ Future<int> deleteImages(BuildContext context, List<int> imageIdList) async {
   for(int id in imageIdList) {
     var response = await deleteImage(id);
     if(response['stat'] == 'fail') {
-      print(response);
       ScaffoldMessenger.of(context).hideCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(
         errorSnackBar(context, '${response['result']}'),
@@ -225,7 +222,6 @@ Future<int> removeImages(BuildContext context, List<int> imageIdList, String cat
   for(int id in imageIdList) {
     var response = await removeImage(id, catId);
     if(response['stat'] == 'fail') {
-      print(response);
       ScaffoldMessenger.of(context).hideCurrentSnackBar();
       ScaffoldMessenger.of(context).showSnackBar(
         errorSnackBar(context, '${response['result']}'),
@@ -266,8 +262,6 @@ Future<dynamic> removeImage(int imageId, String catId) async {
         queryParameters: queries
     );
 
-    print(response.data);
-
     if (response.statusCode == 200) {
       return json.decode(response.data);
     } else {
@@ -464,6 +458,69 @@ Future<dynamic> renameImage(int imageId, String name) async {
         queryParameters: queries
     );
 
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+
+Future<dynamic> uploadCompleted(List<int> imageId, int categoryId) async {
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.images.uploadCompleted",
+  };
+  FormData formData =  FormData.fromMap({
+    "image_id": imageId,
+    "pwg_token": API.prefs.getString("pwg_token"),
+    "category_id": categoryId,
+  });
+  try {
+    Response response = await API().dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+Future<dynamic> communityUploadCompleted(List<int> imageId, int categoryId) async {
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "community.images.uploadCompleted",
+  };
+  FormData formData =  FormData.fromMap({
+    "image_id": imageId,
+    "pwg_token": API.prefs.getString("pwg_token"),
+    "category_id": categoryId,
+  });
+  try {
+    Response response = await API().dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
     if (response.statusCode == 200) {
       return json.decode(response.data);
     } else {

lib/api/ImageAPI.dart

@@ -27,9 +27,7 @@ Future<String> loginUser(String url, String username, String password) async {
     if(response.statusCode == 200) {
       if(json.decode(response.data)['stat'] == 'ok') {
         var status = await sessionStatus();
-        print(status);
         if(status["stat"] == "ok") {
-          print("$url, $username");
           savePreferences(status["result"], url: url, username: username, password: password, isLogged: true, isGuest: false);
           return null;
         }
@@ -38,22 +36,26 @@ Future<String> loginUser(String url, String username, String password) async {
       return 'Invalid username / password';
     }
 
-  } catch(e) {
-    return 'Dio: Invalid url';
+  } on DioError catch(e) {
+    return e.message;
   }
   return 'Something happened';
 }
 Future<String> loginGuest(String url) async {
 
   API().dio.options.baseUrl = url;
 
-  var status = await sessionStatus();
+  try {
+    var status = await sessionStatus();
 
-  if(status["stat"] == "ok") {
-    savePreferences(status["result"], url: url, username: "", password: "", isLogged: true, isGuest: true);
-    return null;
+    if(status["stat"] == "ok") {
+      savePreferences(status["result"], url: url, username: "", password: "", isLogged: true, isGuest: true);
+      return null;
+    }
+    return status["message"];
+  } on DioError catch(e) {
+    return e.message;
   }
-  return 'Invalid url';
 }
 
 Future<Map<String, dynamic>> sessionStatus() async {
@@ -65,14 +67,15 @@ Future<Map<String, dynamic>> sessionStatus() async {
   try {
     Response response = await API().dio.get('ws.php', queryParameters: queries);
     return json.decode(response.data);
-  } catch (e) {
+  } on DioError catch (e) {
     print('Dio error $e');
-    return {"stat": "KO"};
+    return {"stat": "KO",
+      "message": e.message,
+    };
   }
 }
 
 void saveStatus(Map<String, dynamic> status) async {
-  print(status);
   API.prefs.setString("account_username", status["username"]);
   API.prefs.setString('pwg_token', status['pwg_token']);
   API.prefs.setString("status", status["status"]);
@@ -94,9 +97,8 @@ void savePreferences(Map<String, dynamic> status, {
   bool isLogged,
   bool isGuest
 }) async {
-  API.prefs.setString('username', url);
-  API.prefs.setString('username', username);
-  API.prefs.setString('password', password);
+  API.storage.write(key: 'username', value: username);
+  API.storage.write(key: 'password', value: password);
   API.prefs.setBool("is_logged", isLogged);
   API.prefs.setBool("is_guest", isGuest);
   API.prefs.setString("user_status", status["status"]);
@@ -110,4 +112,25 @@ void savePreferences(Map<String, dynamic> status, {
   if(API.prefs.getDouble("landscape_image_count") == null) API.prefs.setDouble("landscape_image_count", 6);
   if(API.prefs.getBool("show_thumbnail_title") == null) API.prefs.setBool("show_thumbnail_title", false);
   saveStatus(status);
+}
+
+Future<Map<String, dynamic>> getMethods() async {
+  Map<String, String> queries = {
+    'format': 'json',
+    'method': 'reflection.getMethodList'
+  };
+
+  try {
+    Response response = await API().dio.get('ws.php', queryParameters: queries);
+    return json.decode(response.data);
+  } catch (e) {
+    print('Dio error $e');
+    return {"stat": "KO"};
+  }
+}
+
+Future<bool> methodExist(String method) async {
+  var result = await getMethods();
+
+  return result["result"]["methods"].contains(method);
 }

lib/api/SessionAPI.dart

@@ -31,14 +31,16 @@ class Constants {
     8: 'Admins',
   };
 
-  static double CONFIRM_DIALOG_MAX_WIDTH = 500.0;
+  static double confirmDialogMaxWidth = 500.0;
 
-  static double ALBUM_MIN_WIDTH = 400.0;
+  static double albumMinWidth = 400.0;
 
-  static double PORTRAIT_IMAGE_COUNT_MIN = 1.0;
-  static double PORTRAIT_IMAGE_COUNT_MAX = 6.0;
-  static double LANDSCAPE_IMAGE_COUNT_MIN = 4.0;
-  static double LANDSCAPE_IMAGE_COUNT_MAX = 10.0;
+  static double portraitImageCountMin = 1.0;
+  static double portraitImageCountMax = 6.0;
+  static double landscapeImageCountMin = 4.0;
+  static double landscapeImageCountMax = 10.0;
+
+  static String privacyPoliciesUrl = "https://piwigo.org/mobile-apps-privacy-policy&webview";
 }
 
 AppLocalizations appStrings(context) {