[1.3.5-beta] Changelog

--bug fix on logging in Open Subtitles --bug fix on space time continuum --added more bugs to fix later
sheeshcake · Nov 7, 2022 · d7bfa71 · d7bfa71
1 parent d394f77
commit d7bfa71
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 18 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -139,7 +139,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.3.4"
+        versionName "1.3.5"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/builds/android/1.3.5-beta/app-release.apk b/builds/android/1.3.5-beta/app-release.apk
diff --git a/src/api/opensubtitle.js b/src/api/opensubtitle.js
@@ -17,9 +17,10 @@ export const getSubtitle = async (movie, token, season, episode) => {
                 Accept: "application/json",
                 "Api-key": apiKey
             }
-        }).catch(e => console.log(e))
-        console.log("downloading subtitle")
+        }).catch(e => console.log(e)).then(res => res)
+        console.log("downloading subtitle", search)
         const r_search = await search.json()
+        console.log(r_search.data[0].id)
         const file_id = r_search.data[0]
         const formData = new FormData()
         console.log("file_id found: ", file_id.attributes.files[0].file_id)
@@ -28,15 +29,20 @@ export const getSubtitle = async (movie, token, season, episode) => {
         const subtitle = await fetch("https://api.opensubtitles.com/api/v1/download", {
             method: "POST",
             headers: {
-                "User-Agent": "PostmanRuntime/7.29.2",
+                "Api-key": apiKey,
                 "Authorization": `Bearer ${token}`,
                 'Content-Type': 'application/json',
-                "Api-Key": apiKey
+                'Accept': 'application/json',
             },
-            body: JSON.stringify(formData)
-        }).then(response => {console.log(response); response.json()}).catch(err => console.log("opensub Download: ", err))
-        console.log("download complete: ", subtitle)
-        return r_subtitle?.data?.link || false;
+            'body': JSON.stringify({
+                "file_id": file_id.attributes.files[0].file_id
+            })
+        }).then(res => res)
+        console.log("subtitle found: ", subtitle)
+        const r_data = await subtitle.json()
+        console.log("download complete: ", r_data)
+        console.log("subtitle: ", r_data?.link )
+        return r_data
     } catch (err) {
         console.log(err)
     }

diff --git a/src/components/CreditsModal/index.js b/src/components/CreditsModal/index.js
@@ -55,7 +55,7 @@ const CreditsModal = ({ isOpen, onClose }) => {
                             color: colors.white,
                             marginBottom: 20
                         }}
-                    >1.3.4 beta</Text>
+                    >1.3.5 beta</Text>
                     <ScrollView>
                         <Text
                             style={{

diff --git a/src/components/MediaPlayer/index.js b/src/components/MediaPlayer/index.js
@@ -129,7 +129,7 @@ const MediaPlayer = ({
                     title: title,
                     language: 'en',
                     type: subtitle.split(".").pop() == "srt" ? TextTrackType.SRT : TextTrackType.VTT,
-                    uri: subtitle
+                    uri: subtitle.link
                 }] : []}
             />
         )

diff --git a/src/screens/Details/index.js b/src/screens/Details/index.js
@@ -52,9 +52,10 @@ const Details = ({ navigation, route }) => {
             const video = await TheFlixProvider.loadFlicks(movie.link, 'movie');
             setVideo(video.url);
             if(open_subtitle_token != ""){
+                console.log("subtitle is loading")
                 const subtitle = await opensubtitle.getSubtitle(movie, open_subtitle_token);
                 if(subtitle){
-                    setSubtitle(subtitle);
+                    setSubtitle(subtitle?.link);
                 }
             }
             setStatus('success');

diff --git a/src/screens/Settings/index.js b/src/screens/Settings/index.js
@@ -54,16 +54,23 @@ const Settings = ({ navigation }) => {
                     },
                     open_subtitle_token: res.token,
                     player_type: player_type,
-                }))
+                })).catch((error) => {
+                    console.log(error)
+                });
+                if(res.token){
+                    dispatch(setOpenSubtitleToken({
+                        username: username,
+                        password: password,
+                        token: res.token
+                    }));
+                }else{
+                    alert("Error logging in")
+                }
                 console.log(await AsyncStorage.getItem("userProfile"))
             } catch (err) {
                 console.log(err)
+                alert("Wrong Username or Password")
             }
-            dispatch(setOpenSubtitleToken({
-                username: username,
-                password: password,
-                token: res.token
-            }));
         }
     }