Merge branch 'localsend:main' into main

sergd88 · Jul 28, 2024 · 7bea930 · 7bea930
2 parents 94a0cab + 822f429
commit 7bea930
Show file tree

Hide file tree

Showing 60 changed files with 544 additions and 52 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -396,7 +396,7 @@ jobs:
         with:
           upload_url: ${{ steps.draft_release.outputs.upload_url }}
           asset_path: app-x86_64-release.apk
-          asset_name: LocalSend${{ needs.build.outputs.version }}-android-x64.apk
+          asset_name: LocalSend-${{ needs.build.outputs.version }}-android-x64.apk
           asset_content_type: application/vnd.android.package-archive
 
       # TAR.GZ (x86_64)

diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -84,3 +84,16 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
+
+// To comply with F-Droid version code schema
+// https://github.com/localsend/localsend/issues/1534
+ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
+import com.android.build.OutputFile
+android.applicationVariants.all { variant ->
+    variant.outputs.each { output ->
+        def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+        if (abiVersionCode != null) {
+            output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
+        }
+    }
+}
diff --git a/app/assets/CHANGELOG.md b/app/assets/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.16.0 (unreleased)
+
+- fix(android): properly close app on back gesture (@Tienisto)
+
 ## 1.15.2 (2024-07-25)
 
 - feat: extract network scanning to separate threads, scanning should not cause UI lags anymore (@Tienisto)

diff --git a/app/assets/i18n/_missing_translations_ar.json b/app/assets/i18n/_missing_translations_ar.json
@@ -11,6 +11,12 @@
       "requirePin": "@:webSharePage.requirePin"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -23,6 +29,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_bn.json b/app/assets/i18n/_missing_translations_bn.json
@@ -18,6 +18,12 @@
       "discoveryTimeout": "Discovery Timeout"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -31,6 +37,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_ca.json b/app/assets/i18n/_missing_translations_ca.json
@@ -38,6 +38,12 @@
       "termsOfUse": "Terms of Use"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -58,6 +64,7 @@
     ],
     "author": "Author",
     "contributors": "Contributors",
+    "packagers": "Packagers",
     "translators": "Translators"
   },
   "donationPage": {

diff --git a/app/assets/i18n/_missing_translations_cs.json b/app/assets/i18n/_missing_translations_cs.json
@@ -18,6 +18,12 @@
       "discoveryTimeout": "Discovery Timeout"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -31,6 +37,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_da.json b/app/assets/i18n/_missing_translations_da.json
@@ -18,6 +18,12 @@
       "discoveryTimeout": "Discovery Timeout"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -31,6 +37,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_el.json b/app/assets/i18n/_missing_translations_el.json
@@ -14,6 +14,12 @@
       "discoveryTimeout": "Discovery Timeout"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -26,6 +32,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_en_IN.json b/app/assets/i18n/_missing_translations_en_IN.json
@@ -2,5 +2,14 @@
   "@@info": [
     "Here are translations that exist in <en> but not in <en-IN>.",
     "After editing this file, you can run 'dart run slang apply --locale=en-IN' to quickly apply the newly added translations."
-  ]
+  ],
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
+  "aboutPage": {
+    "packagers": "Packagers"
+  }
 }
diff --git a/app/assets/i18n/_missing_translations_es_ES.json b/app/assets/i18n/_missing_translations_es_ES.json
@@ -14,6 +14,12 @@
       "discoveryTimeout": "Discovery Timeout"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -26,6 +32,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_eu.json b/app/assets/i18n/_missing_translations_eu.json
@@ -26,6 +26,12 @@
       "termsOfUse": "Terms of Use"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -46,6 +52,7 @@
     ],
     "author": "Author",
     "contributors": "Contributors",
+    "packagers": "Packagers",
     "translators": "Translators"
   },
   "donationPage": {

diff --git a/app/assets/i18n/_missing_translations_fa.json b/app/assets/i18n/_missing_translations_fa.json
@@ -2,5 +2,14 @@
   "@@info": [
     "Here are translations that exist in <en> but not in <fa>.",
     "After editing this file, you can run 'dart run slang apply --locale=fa' to quickly apply the newly added translations."
-  ]
+  ],
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
+  "aboutPage": {
+    "packagers": "Packagers"
+  }
 }
diff --git a/app/assets/i18n/_missing_translations_fi.json b/app/assets/i18n/_missing_translations_fi.json
@@ -11,6 +11,12 @@
       "requirePin": "@:webSharePage.requirePin"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -23,6 +29,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_fil_PH.json b/app/assets/i18n/_missing_translations_fil_PH.json
@@ -18,6 +18,12 @@
       "discoveryTimeout": "Discovery Timeout"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -31,6 +37,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_fr.json b/app/assets/i18n/_missing_translations_fr.json
@@ -2,5 +2,14 @@
   "@@info": [
     "Here are translations that exist in <en> but not in <fr>.",
     "After editing this file, you can run 'dart run slang apply --locale=fr' to quickly apply the newly added translations."
-  ]
+  ],
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
+  "aboutPage": {
+    "packagers": "Packagers"
+  }
 }
diff --git a/app/assets/i18n/_missing_translations_gu.json b/app/assets/i18n/_missing_translations_gu.json
@@ -11,6 +11,12 @@
       "requirePin": "@:webSharePage.requirePin"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -23,6 +29,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"

diff --git a/app/assets/i18n/_missing_translations_he.json b/app/assets/i18n/_missing_translations_he.json
@@ -2,5 +2,14 @@
   "@@info": [
     "Here are translations that exist in <en> but not in <he>.",
     "After editing this file, you can run 'dart run slang apply --locale=he' to quickly apply the newly added translations."
-  ]
+  ],
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
+  "aboutPage": {
+    "packagers": "Packagers"
+  }
 }
diff --git a/app/assets/i18n/_missing_translations_hu.json b/app/assets/i18n/_missing_translations_hu.json
@@ -2,5 +2,14 @@
   "@@info": [
     "Here are translations that exist in <en> but not in <hu>.",
     "After editing this file, you can run 'dart run slang apply --locale=hu' to quickly apply the newly added translations."
-  ]
+  ],
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
+  "aboutPage": {
+    "packagers": "Packagers"
+  }
 }
diff --git a/app/assets/i18n/_missing_translations_id.json b/app/assets/i18n/_missing_translations_id.json
@@ -11,6 +11,12 @@
       "requirePin": "@:webSharePage.requirePin"
     }
   },
+  "troubleshootPage": {
+    "noDiscovery": {
+      "symptom": "This device cannot discover other devices.",
+      "solution": "Make sure that all devices are on the same Wi-Fi network and share the same configuration (port, multicast address, encryption). You can try to type the IP address of the target device manually. If this works, consider adding this device to the favorites so it can be automatically discovered in the future."
+    }
+  },
   "receiveHistoryPage": {
     "entryActions": {
       "showInFolder": "Show in folder"
@@ -23,6 +29,9 @@
     "requirePin": "Require PIN",
     "pinHint": "The PIN is \"{pin}\""
   },
+  "aboutPage": {
+    "packagers": "Packagers"
+  },
   "dialogs": {
     "pin": {
       "title": "Enter PIN"