mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-29 03:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix share/import URL crash on Android 6

Browse Source
This commit is contained in:
Sylvia van Os
2021-07-21 18:22:50 +02:00
parent c711aeae7f
commit 96a046b165
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,10 +1,11 @@
# Changelog
## Unreleased
## v2.0.1 (2021-07-21)
Changes:
- Several minor translation and UI fixes
- Fix crash in import/sharing loyalty card on Android 6
## v2.0 (2021-07-14)

4
app/build.gradle
View File

@@ -18,8 +18,8 @@ android {
applicationId "me.hackerchick.catima"
minSdkVersion 19
targetSdkVersion 30
versionCode 70
versionName "2.0"
versionCode 71
versionName "2.0.1"
vectorDrawables.useSupportLibrary true
}

3
app/src/main/java/protect/card_locker/ImportExportTask.java
View File

@@ -12,6 +12,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import protect.card_locker.importexport.DataFormat;
import protect.card_locker.importexport.ImportExportResult;
@@ -76,7 +77,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
try
{
OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
result = MultiFormatExporter.exportData(context, db, stream, format);
writer.close();
}

4
app/src/main/java/protect/card_locker/ImportURIHelper.java
View File

@@ -83,7 +83,7 @@ public class ImportURIHelper {
if (fragment != null) {
for (String fragmentPart : fragment.split("&")) {
String[] fragmentData = fragmentPart.split("=", 2);
kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.toString()));
kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.name()));
}
}
@@ -134,7 +134,7 @@ public class ImportURIHelper {
}
// Double-encode the value to make sure it can't accidentally contain symbols that'll break the parser
fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.toString()));
fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.name()));
return fragment;
}

2
app/src/main/java/protect/card_locker/ZipUtils.java
View File

@@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets;
public class ZipUtils {
static public String read(ZipInputStream zipInputStream) throws IOException {
StringBuilder stringBuilder = new StringBuilder();
Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, Charset.forName(StandardCharsets.UTF_8.name())));
Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
int c;
while ((c = reader.read()) != -1) {
stringBuilder.append((char) c);