Open beta on Google play

Author: remi-martin

.gitignore

@@ -6,3 +6,4 @@
 /.flutter-plugins
 /.flutter-plugins-dependencies
 /.packages
+

android/app/build.gradle

@@ -25,6 +25,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
+
 android {
     compileSdkVersion 30
 
@@ -40,12 +47,17 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
-
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }

lib/api/CategoryAPI.dart

@@ -1,58 +1,58 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
-import 'package:piwigo_ng/model/CategoryModel.dart';
-
 import 'API.dart';
 
-Future<List<dynamic>> fetchAlbums(String albumID) async {
+Future<Map<String,dynamic>> fetchAlbums(String albumID) async {
 
   Map<String, String> queries = {
     "format": "json",
     "method": "pwg.categories.getList",
     "cat_id": albumID
   };
-  Response response = await API.dio.get('ws.php', queryParameters: queries);
 
-  if (response.statusCode == 200) {
-    return json.decode(response.data)["result"]["categories"];
-  } else {
-    throw Exception("bad request: "+response.statusCode.toString());
+  try {
+    Response response = await API.dio.get('ws.php', 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<CategoryModel> getAlbumList() async {
+Future<Map<String,dynamic>> getAlbumList() async {
   Map<String, String> queries = {
     "format": "json",
     "method": "pwg.categories.getAdminList",
   };
 
-  Response response = await API.dio.get('ws.php', queryParameters: queries);
+  try {
+    Response response = await API.dio.get('ws.php', queryParameters: queries);
 
-  if (response.statusCode == 200) {
-    CategoryModel root = CategoryModel("0", "root", fullname: "root");
-    json.decode(response.data)['result']['categories'].forEach((cat) {
-      List<int> rank = cat['global_rank'].split('.').map(int.parse).toList().cast<int>();
-      CategoryModel newCat = CategoryModel(cat['id'], cat['name'], comment: cat['comment'], nbImages: cat['nb_images'].toString(), fullname: cat['fullname'], status: cat['status']);
-      if(rank.length > 1) {
-        CategoryModel nextInputCat = root.children.elementAt(rank.first-1);
-        rank.removeAt(0);
-        addCatRecursive(rank, newCat, nextInputCat);
-      } else {
-        root.children.add(newCat);
-      }
-    });
-    return root;
-  } else {
-    throw Exception("bad request: "+response.statusCode.toString());
-  }
-}
-void addCatRecursive(List<int> rank, CategoryModel cat, CategoryModel inputCat) {
-  if(rank.length > 1) {
-    CategoryModel nextInputCat = inputCat.children.elementAt(rank.first-1);
-    rank.removeAt(0);
-    addCatRecursive(rank, cat, nextInputCat);
-  } else {
-    inputCat.children.add(cat);
+    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
+    };
   }
 }
 
@@ -64,16 +64,23 @@ Future<dynamic> addCategory(String catName, String catDesc, String parent) async
     "comment": catDesc,
     "parent": parent
   };
-
   try {
     Response response = await API.dio.post('ws.php', queryParameters: queries);
 
     if (response.statusCode == 200) {
       return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
     }
   } catch(e) {
-    print('Dio add category error $e');
-    return e;
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
   }
 }
 Future<dynamic> deleteCategory(String catId) async {
@@ -86,18 +93,25 @@ Future<dynamic> deleteCategory(String catId) async {
     "pwg_token": API.prefs.getString("pwg_token"),
   });
   try {
-    Response response = await API.dio.post(
-        'ws.php',
+    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) {
-    print('Dio delete category error $e');
-    return e;
+  } catch(e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
   }
 }
 Future<dynamic> moveCategory(int catId, String parentCatId) async {
@@ -110,22 +124,30 @@ Future<dynamic> moveCategory(int catId, String parentCatId) async {
     "parent": parentCatId,
     "pwg_token": API.prefs.getString("pwg_token"),
   });
+
   try {
-    Response response = await API.dio.post(
-        'ws.php',
+    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) {
-    print('Dio move category error $e');
-    return e;
+  } catch(e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
   }
 }
-Future<dynamic> editCategory(int catId, String catName, String catDesc, bool private) async {
+Future<dynamic> editCategory(int catId, String catName, String catDesc) async {
   Map<String, String> queries = {
     "format": "json",
     "method": "pwg.categories.setInfo",
@@ -134,7 +156,6 @@ Future<dynamic> editCategory(int catId, String catName, String catDesc, bool pri
     "category_id": catId,
     "name": catName,
     "comment": catDesc,
-    "status": private ? "private" : "public",
   });
   try {
     Response response = await API.dio.post(