Merge branch 'release/0.7.8'

Teifun2 · Sep 23, 2022 · ea28dd1 · ea28dd1
2 parents fa3837e + e7a1679
commit ea28dd1
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
       with:
         java-version: '12.x'
         distribution: 'adopt'
-    - uses: subosito/[email protected].0
+    - uses: subosito/[email protected].1
       with:
         flutter-version: '3.3.0'
     - run: flutter pub get

diff --git a/docker/data/Recipes/problem/recipe.json b/docker/data/Recipes/problem/recipe.json
@@ -27,5 +27,5 @@
     "dateModified": "2021-10-30T16:02:47+0000",
     "dateCreated": "2021-10-30T16:02:22+0000",
     "printImage": false,
-    "imageUrl": "\/apps\/cookbook\/recipes\/128051\/image?size=full"
+    "imageUrl": "\/index.php\/apps\/cookbook\/recipes\/128051\/image?size=full"
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt
@@ -0,0 +1 @@
+- Bugfixes
diff --git a/lib/src/services/authentication_provider.dart b/lib/src/services/authentication_provider.dart
@@ -168,7 +168,8 @@ class AuthenticationProvider {
     String basicAuth,
     bool isSelfSignedCertificate,
   ) async {
-    String urlAuthCheck = serverUrl + '/apps/cookbook/categories';
+    String urlAuthCheck =
+        serverUrl + '/index.php/apps/cookbook/api/v1/categories';
 
     dio.Response response;
     try {

diff --git a/lib/src/services/categories_provider.dart b/lib/src/services/categories_provider.dart
@@ -11,7 +11,7 @@ class CategoriesProvider {
         UserRepository().getCurrentAppAuthentication();
 
     final String url =
-        "${appAuthentication.server}/apps/cookbook/categories";
+        "${appAuthentication.server}/index.php/apps/cookbook/api/v1/categories";
 
     // Parse categories
     try {

diff --git a/lib/src/services/category_recipes_short_provider.dart b/lib/src/services/category_recipes_short_provider.dart
@@ -13,13 +13,13 @@ class CategoryRecipesShortProvider {
         UserRepository().getCurrentAppAuthentication();
 
     String url =
-        "${appAuthentication.server}/index.php/apps/cookbook/category/$category";
+        "${appAuthentication.server}/apps/cookbook/api/v1/category/$category";
     if (androidApiVersion != AndroidApiVersion.BEFORE_API_ENDPOINT) {
       category = category == "*"
           ? "_"
           : category; // Mapping from * to _ for recipes without a category!
       url =
-          "${appAuthentication.server}/apps/cookbook/api/v1/category/$category";
+          "${appAuthentication.server}/index.php/apps/cookbook/api/v1/category/$category";
     }
 
     // Parse categories

diff --git a/lib/src/services/recipe_provider.dart b/lib/src/services/recipe_provider.dart
@@ -12,7 +12,7 @@ class RecipeProvider {
         UserRepository().getCurrentAppAuthentication();
 
     final String url =
-        "${appAuthentication.server}/apps/cookbook/api/v1/recipes/$id";
+        "${appAuthentication.server}/index.php/apps/cookbook/api/v1/recipes/$id";
     // Parse categories
     try {
       String contents = await Network().get(url);
@@ -29,7 +29,7 @@ class RecipeProvider {
 
     try {
       final String url =
-          "${appAuthentication.server}/apps/cookbook/api/v1/recipes/${recipe.id}";
+          "${appAuthentication.server}/index.php/apps/cookbook/api/v1/recipes/${recipe.id}";
       var response = await client.put(url,
           data: recipe.toJson(),
           options: new Options(
@@ -50,7 +50,7 @@ class RecipeProvider {
 
     try {
       var response = await client.post(
-          "${appAuthentication.server}/apps/cookbook/api/v1/recipes",
+          "${appAuthentication.server}/index.php/apps/cookbook/api/v1/recipes",
           data: recipe.toJson(),
           options: new Options(
             contentType: "application/json;charset=UTF-8",
@@ -68,7 +68,7 @@ class RecipeProvider {
 
     try {
       var response = await client.post(
-          "${appAuthentication.server}/apps/cookbook/import",
+          "${appAuthentication.server}/index.php/apps/cookbook/api/v1/import",
           data: {"url": url},
           options: new Options(
             contentType: "application/json;charset=UTF-8",

diff --git a/lib/src/services/recipes_short_provider.dart b/lib/src/services/recipes_short_provider.dart
@@ -10,7 +10,7 @@ class RecipesShortProvider {
     AppAuthentication appAuthentication =
     UserRepository().getCurrentAppAuthentication();
 
-    final String url = "${appAuthentication.server}/apps/cookbook/api/v1/recipes";
+    final String url = "${appAuthentication.server}/index.php/apps/cookbook/api/v1/recipes";
     try {
       String contents = await Network().get(url);
             return RecipeShort.parseRecipesShort(contents);

diff --git a/lib/src/services/version_provider.dart b/lib/src/services/version_provider.dart
@@ -14,7 +14,7 @@ class VersionProvider {
         UserRepository().getCurrentAppAuthentication();
 
     var response = await appAuthentication.authenticatedClient
-        .get("${appAuthentication.server}/apps/cookbook/api/version");
+        .get("${appAuthentication.server}/index.php/apps/cookbook/api/version");
 
     if (response.statusCode == 200 &&
         !response.data.toString().startsWith("<!DOCTYPE html>")) {

diff --git a/lib/src/widget/authentication_cached_network_recipe_image.dart b/lib/src/widget/authentication_cached_network_recipe_image.dart
@@ -28,7 +28,7 @@ class AuthenticationCachedNetworkRecipeImage extends StatelessWidget {
 
     return AuthenticationCachedNetworkImage(
       url:
-          '${appAuthentication.server}/apps/cookbook/api/v1/recipes/$recipeId/image?size=$settings',
+          '${appAuthentication.server}/index.php/apps/cookbook/api/v1/recipes/$recipeId/image?size=$settings',
       width: width,
       height: height,
       boxFit: boxFit,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,7 @@ description: A new Flutter application.
 # 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.7.7+22
+version: 0.7.8+23
 
 environment:
   sdk: ">=2.10.0 <3.0.0"