Merge remote-tracking branch 'origin/master'

Batorian · May 10, 2024 · eae59dd · eae59dd
2 parents 080ba4a + f421bc6
commit eae59dd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,5 +54,5 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
-          name: LNReader-r${{ env.COMMIT_COUNT }}
+          name: LNReaderTesting-r${{ env.COMMIT_COUNT }}
           path: android/app/build/outputs/apk/release/app-release.apk
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <resources>
-  <string name="app_name">LNReader</string>
-</resources>
+  <string name="app_name">LNReaderTesting</string>
+</resources>
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'LNReader'
+rootProject.name = 'LNReaderTesting'
 
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "lnreader",
+  "name": "lnreadertesting",
   "version": "2.0.0",
   "private": true,
   "scripts": {

diff --git a/src/screens/settings/SettingsBackupScreen/Components/GoogleDriveModal.tsx b/src/screens/settings/SettingsBackupScreen/Components/GoogleDriveModal.tsx
@@ -101,9 +101,9 @@ function CreateBackup({
 
   const prepare = async () => {
     setFetching(true);
-    let rootFolder = await exists('LNReader', true, undefined, true);
+    let rootFolder = await exists('LNReaderTesting', true, undefined, true);
     if (!rootFolder) {
-      rootFolder = await makeDir('LNReader');
+      rootFolder = await makeDir('LNReaderTesting');
     }
     const backupFolderName = backupName.trim() + '.backup';
     let backupFolder = await exists(backupFolderName, true, rootFolder.id);
@@ -157,7 +157,7 @@ function RestoreBackup({
 }) {
   const [backupList, setBackupList] = useState<DriveFile[]>([]);
   useEffect(() => {
-    exists('LNReader', true, undefined, true).then(rootFolder => {
+    exists('LNReaderTesting', true, undefined, true).then(rootFolder => {
       if (rootFolder) {
         getBackups(rootFolder.id, true).then(backups => setBackupList(backups));
       }

diff --git a/src/screens/settings/SettingsBackupScreen/Components/SelfHostModal.tsx b/src/screens/settings/SettingsBackupScreen/Components/SelfHostModal.tsx
@@ -163,7 +163,7 @@ function SetHost({
             fetchTimeout(host, {}, 2000)
               .then(res => res.json())
               .then(data => {
-                if (data.name === 'LNReader') {
+                if (data.name === 'LNReaderTesting') {
                   setBackupModal(BackupModal.CONNECTED);
                 } else {
                   throw new Error(getString('backupScreen.remote.unknownHost'));