Fixed Spotify playlist parsing

00aj99 · Dec 28, 2019 · cf16fa7 · cf16fa7
1 parent d712825
commit cf16fa7
Show file tree

Hide file tree

Showing 36 changed files with 809 additions and 404 deletions.
diff --git a/.gradle/4.6/fileContent/fileContent.lock b/.gradle/4.6/fileContent/fileContent.lock
diff --git a/.gradle/4.6/fileHashes/fileHashes.bin b/.gradle/4.6/fileHashes/fileHashes.bin
diff --git a/.gradle/4.6/fileHashes/fileHashes.lock b/.gradle/4.6/fileHashes/fileHashes.lock
diff --git a/.gradle/4.6/fileHashes/resourceHashesCache.bin b/.gradle/4.6/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/4.6/javaCompile/classAnalysis.bin b/.gradle/4.6/javaCompile/classAnalysis.bin
diff --git a/.gradle/4.6/javaCompile/jarAnalysis.bin b/.gradle/4.6/javaCompile/jarAnalysis.bin
diff --git a/.gradle/4.6/javaCompile/javaCompile.lock b/.gradle/4.6/javaCompile/javaCompile.lock
diff --git a/.gradle/4.6/javaCompile/taskHistory.bin b/.gradle/4.6/javaCompile/taskHistory.bin
diff --git a/.gradle/4.6/javaCompile/taskJars.bin b/.gradle/4.6/javaCompile/taskJars.bin
diff --git a/.gradle/4.6/taskHistory/taskHistory.bin b/.gradle/4.6/taskHistory/taskHistory.bin
diff --git a/.gradle/4.6/taskHistory/taskHistory.lock b/.gradle/4.6/taskHistory/taskHistory.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/app.iml b/app/app.iml
@@ -157,7 +157,10 @@
     <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.duanhong169:drawabletoolbox:1.0.7@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.mindorks.android:prdownloader:0.6.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:spotify-auth-release:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.volley:volley:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.clans:fab:1.6.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.spotify.android:auth:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.mikhaellopez:circularprogressbar:3.0.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -51,8 +51,11 @@ dependencies {
     implementation 'com.mindorks.android:prdownloader:0.6.0'
 
     implementation 'org.jsoup:jsoup:1.11.1'
+    implementation project(':spotify-auth-release')
+    implementation 'com.android.volley:volley:1.1.1'
 
     implementation 'com.github.clans:fab:1.6.4'
+    implementation 'com.spotify.android:auth:1.1.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.mikhaellopez:circularprogressbar:3.0.3'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,9 @@
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="ca-app-pub-1763645001743174~5602018181" />
+        <activity
+            android:name="com.spotify.sdk.android.authentication.LoginActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name=".EqualizerActivity"
             android:launchMode="singleTask"
@@ -114,7 +117,9 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".CPlaylistActivity" />
+        <activity android:name=".CPlaylistActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
         <activity android:name=".SettingsActivity" />
         <activity
             android:name=".SplashActivity"

diff --git a/app/src/main/java/com/kpstv/youtube/Backup.java b/app/src/main/java/com/kpstv/youtube/Backup.java
@@ -503,7 +503,7 @@ void showListDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(PlayerActivity2.this);
         builder.setTitle("Select Media Codec");
 
-        builder.setItems(arrays, (dialog, which) -> {
+        builder.setItems(arrays, (globalAlertDialog, which) -> {
             YTConfig config = configs.get(which);
             String filename;
             if (config.getText().length() > 55) {
@@ -562,8 +562,8 @@ void showListDialog() {
                     Toast.LENGTH_SHORT).show();
             showAd();
         });
-        AlertDialog dialog = builder.create();
-        dialog.show();
+        AlertDialog globalAlertDialog = builder.create();
+        globalAlertDialog.show();
     }
 
     private void downloadFromUrl(String youtubeDlUrl, String downloadTitle, String fileName) {
@@ -621,14 +621,14 @@ protected void onPreExecute() {
             Log.e("ExecutingTask","true");
             LayoutInflater inflater = getLayoutInflater();
             dialogView = inflater.inflate(R.layout.alert_merger, null);
-            tview = dialogView.findViewById(R.id.textView);
+            tview = dialogView.findViewById(R.id.titleAuthorText);
             bar = dialogView.findViewById(R.id.progressBar);
             AlertDialog.Builder alert = new AlertDialog.Builder(PlayerActivity2.this);
             alert.setTitle("Download");
             alert.setMessage("This could take a while depending upon length of audio!");
             alert.setCancelable(false);
             alert.setView(dialogView);
-            alert.setNegativeButton("Cancel", (dialog, which) -> {
+            alert.setNegativeButton("Cancel", (globalAlertDialog, which) -> {
                 cutTask.cancel(true);
             });
             alertdialog = alert.create();
@@ -731,14 +731,14 @@ protected void onPreExecute() {
             Log.e("ExecutingTask","true");
             LayoutInflater inflater = getLayoutInflater();
             dialogView = inflater.inflate(R.layout.alert_merger, null);
-            tview = dialogView.findViewById(R.id.textView);
+            tview = dialogView.findViewById(R.id.titleAuthorText);
             bar = dialogView.findViewById(R.id.progressBar);
             AlertDialog.Builder alert = new AlertDialog.Builder(PlayerActivity2.this);
             alert.setTitle("Merging");
             alert.setMessage("This could take a while depending upon length of video!");
             alert.setCancelable(false);
             alert.setView(dialogView);
-            alert.setNegativeButton("Cancel", (dialog, which) -> {
+            alert.setNegativeButton("Cancel", (globalAlertDialog, which) -> {
                 mergeTask.cancel(true);
             });
             alertdialog = alert.create();