Merge pull request #25 from Fmaldonado6/development

Development
Fmaldonado6 · Jun 16, 2022 · 4dfd044 · 4dfd044
2 parents 343b7b9 + 875ab92
commit 4dfd044
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/mobile_app/app/release/app-release.apk b/mobile_app/app/release/app-release.apk
diff --git a/mobile_app/app/release/output-metadata.json b/mobile_app/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 11,
-      "versionName": "v3.0.0",
+      "versionCode": 12,
+      "versionName": "v3.0.1",
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/mobile_app/app/src/main/java/com/fmaldonado/akiyama/ui/activities/main/MainActivity.kt b/mobile_app/app/src/main/java/com/fmaldonado/akiyama/ui/activities/main/MainActivity.kt
@@ -33,7 +33,7 @@ class MainActivity : AppCompatActivity() {
                 UpdateStatus.Looking -> showSnackBar(getString(R.string.looking_for_update_text))
                 UpdateStatus.NewUpdate -> showSnackBar(
                     getString(R.string.new_update_text),
-                    getString(R.string.updated_text)
+                    getString(R.string.download_update_text)
                 ) {
                     DownloadDialog().show(supportFragmentManager, DownloadDialog.TAG)
                 }

diff --git a/server/src/network/animeFlvNetworkDataSoucre.ts b/server/src/network/animeFlvNetworkDataSoucre.ts
@@ -11,8 +11,9 @@ export class AnimeFlvNetworkDataSource {
         if (!this.browser)
             this.browser = await puppeteer.launch()
         const page = await this.browser.newPage();
+        page.setDefaultNavigationTimeout(30000);
         await page.setUserAgent('Mozilla/5.0 (Windows NT 5.1; rv:5.0) Gecko/20100101 Firefox/5.0')
-  
+
         return page;
     }