From 8fd84c392995e4ca224b280fc25cddb60f3aca45 Mon Sep 17 00:00:00 2001
From: Pato05 <pato05mc@gmail.com>
Date: Wed, 17 Jan 2024 20:41:28 +0100
Subject: [PATCH] sync changes

---
 android/app/build.gradle                      |   2 +-
 android/app/src/main/AndroidManifest.xml      | 116 +++++++++---------
 android/app/src/main/res/raw/keep.xml         |   6 +
 lib/api/deezer.dart                           |   1 +
 .../download_manager/download_manager.dart    |   3 -
 5 files changed, 65 insertions(+), 63 deletions(-)
 create mode 100644 android/app/src/main/res/raw/keep.xml

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4112a8f..a2175a3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -60,7 +60,7 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            shrinkResources false
+            shrinkResources true
             minifyEnabled true
         }
         debug {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 03c11f2..d542126 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,32 +5,32 @@
   package="f.f.freezer"
 >
 
-    <!--
+  <!--
      io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here.
     -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
-    <uses-feature
+  <uses-feature
     android:name="android.software.LEANBACK"
     android:required="true"
   />
 
-    <application
+  <application
     android:icon="@mipmap/ic_launcher"
     android:label="Freezer"
     android:requestLegacyExternalStorage="true"
     android:usesCleartextTraffic="true"
   >
 
-        <service
+    <service
       android:name=".DownloadService"
       android:enabled="true"
       android:exported="true"
@@ -38,7 +38,7 @@
       android:process=":FreezerDownloadService"
     />
 
-        <activity
+    <activity
       android:name=".MainActivity"
       android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
       android:hardwareAccelerated="true"
@@ -51,94 +51,92 @@
       android:exported="true"
     >
 
-            <!--
+      <!--
                  Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI.
             -->
-            <meta-data
+      <meta-data
         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
+      <meta-data
         android:name="io.flutter.embedding.android.SplashScreenDrawable"
         android:resource="@drawable/launch_background"
       />
 
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
 
 
-            <!-- App links -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="www.deezer.com" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="deezer.com" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="deezer.page.link" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.MAIN" />
-                <category
-          android:name="android.intent.category.LEANBACK_LAUNCHER"
-        />
-            </intent-filter>
-        </activity>
-        <!--
+      <!-- App links -->
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="https" android:host="www.deezer.com" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="https" android:host="deezer.com" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="https" android:host="deezer.page.link" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <!--
  Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
         -->
-        <meta-data android:name="flutterEmbedding" android:value="2" />
+    <meta-data android:name="flutterEmbedding" android:value="2" />
 
-        <service
+    <service
       android:name="com.ryanheise.audioservice.AudioService"
       android:foregroundServiceType="mediaPlayback"
       android:exported="true"
       tools:ignore="Instantiatable"
     >
-          <intent-filter>
-            <action android:name="android.media.browse.MediaBrowserService" />
-          </intent-filter>
-        </service>
+      <intent-filter>
+        <action android:name="android.media.browse.MediaBrowserService" />
+      </intent-filter>
+    </service>
 
-        <receiver
+    <receiver
       android:name="com.ryanheise.audioservice.MediaButtonReceiver"
       android:exported="true"
       tools:ignore="Instantiatable"
     >
-          <intent-filter>
-            <action android:name="android.intent.action.MEDIA_BUTTON" />
-          </intent-filter>
-        </receiver> 
+      <intent-filter>
+        <action android:name="android.intent.action.MEDIA_BUTTON" />
+      </intent-filter>
+    </receiver>
 
-        <meta-data
+    <meta-data
       android:name="com.google.android.gms.car.application"
       android:resource="@xml/automotive_app_desc"
     />
-    </application>
+  </application>
 
 </manifest>
diff --git a/android/app/src/main/res/raw/keep.xml b/android/app/src/main/res/raw/keep.xml
new file mode 100644
index 0000000..6f11e52
--- /dev/null
+++ b/android/app/src/main/res/raw/keep.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- keep assets (notification, playback icons, ...) -->
+<resources
+  xmlns:tools="http://schemas.android.com/tools"
+  tools:keep="@drawable/*"
+/>
diff --git a/lib/api/deezer.dart b/lib/api/deezer.dart
index 0eaa41c..65aefd9 100644
--- a/lib/api/deezer.dart
+++ b/lib/api/deezer.dart
@@ -144,6 +144,7 @@ class DeezerAPI {
           'hash': hash
         },
         options: Options(responseType: ResponseType.json));
+    print(res.data);
     final accessToken = res.data['access_token'] as String?;
     if (accessToken == null) {
       throw Exception('login failed, access token is null');
diff --git a/lib/api/download_manager/download_manager.dart b/lib/api/download_manager/download_manager.dart
index d006b6b..9671f13 100644
--- a/lib/api/download_manager/download_manager.dart
+++ b/lib/api/download_manager/download_manager.dart
@@ -12,11 +12,8 @@ import 'package:freezer/api/paths.dart';
 import 'package:freezer/main.dart';
 import 'package:freezer/settings.dart';
 import 'package:freezer/translations.i18n.dart';
-<<<<<<< Updated upstream
-=======
 import 'package:isar/isar.dart';
 import '../download.dart' as dl;
->>>>>>> Stashed changes
 
 class DownloadManager {
   //implements dl.DownloadManager {