From 939e43c11043274313ca5f7056e8c69f76224be0 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sun, 20 Aug 2023 21:00:45 +0200
Subject: [PATCH] fix import for MLS / OpenCelliD files without header, fixes
 #20

---
 CHANGELOG.md                                                  | 4 ++++
 app/build.gradle                                              | 4 ++--
 .../java/org/fitchfamily/android/dejavu/SettingsActivity.kt   | 1 +
 fastlane/metadata/android/en-US/changelogs/39.txt             | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/39.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f9d137..b45932a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Removed
 - Not applicable
 
+## [1.2.11] - 2023-08-20
+### Changed
+- Import MLS / OpenCelliD lists without header
+
 ## [1.2.10] - 2023-05-22
 ### Changed
 - Extended blacklist (thanks to Sorunome)
diff --git a/app/build.gradle b/app/build.gradle
index 7fd85b9..a508650 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "helium314.localbackend"
         minSdkVersion 18
         targetSdkVersion 33
-        versionCode 38
-        versionName "1.2.10"
+        versionCode 39
+        versionName "1.2.11"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/org/fitchfamily/android/dejavu/SettingsActivity.kt b/app/src/main/java/org/fitchfamily/android/dejavu/SettingsActivity.kt
index 97bcf21..ec25b8e 100644
--- a/app/src/main/java/org/fitchfamily/android/dejavu/SettingsActivity.kt
+++ b/app/src/main/java/org/fitchfamily/android/dejavu/SettingsActivity.kt
@@ -321,6 +321,7 @@ class SettingsActivity : PreferenceActivity() {
                     reader.readLine() // skip the header line, as it's not used
                     4
                 }
+                parseLine(firstLine, 0, emptySet(), null) != null -> 0 // MLS, but without header
                 else -> {
                     Toast.makeText(this, R.string.import_error_format, Toast.LENGTH_LONG).show()
                     return
diff --git a/fastlane/metadata/android/en-US/changelogs/39.txt b/fastlane/metadata/android/en-US/changelogs/39.txt
new file mode 100644
index 0000000..1519360
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/39.txt
@@ -0,0 +1 @@
+- Import MLS / OpenCelliD lists without header