mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-04 15:43:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression and release 2.7.2

Browse Source
This commit is contained in:
Sylvia van Os
2021-10-09 23:50:57 +02:00
parent 952f7a933b
commit 1462911ffa
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Changelog
## v2.7.2 - 87 (2021-10-09)
- Fix regression breaking import/export
## v2.7.1 - 86 (2021-10-07)
- Improve search with spaces

4
app/build.gradle
View File

@@ -18,8 +18,8 @@ android {
applicationId "me.hackerchick.catima"
minSdkVersion 21
targetSdkVersion 31
versionCode 86
versionName "2.7.1"
versionCode 87
versionName "2.7.2"
vectorDrawables.useSupportLibrary true
multiDexEnabled true

29
app/src/main/java/protect/card_locker/ImportExportActivity.java
View File

@@ -188,7 +188,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity
builder.show();
}
private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password)
private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone)
{
ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
{
@@ -196,6 +196,13 @@ public class ImportExportActivity extends CatimaAppCompatActivity
public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
{
onImportComplete(result, targetUri, dataFormat);
if (closeWhenDone) {
try {
target.close();
} catch (IOException ioException) {
ioException.printStackTrace();
}
}
}
};
@@ -204,14 +211,20 @@ public class ImportExportActivity extends CatimaAppCompatActivity
importExporter.execute();
}
private void startExport(final OutputStream target, final Uri targetUri)
private void startExport(final OutputStream target, final Uri targetUri, final boolean closeWhenDone)
{
ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
{
@Override
public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
{
public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
onExportComplete(result, targetUri);
if (closeWhenDone) {
try {
target.close();
} catch (IOException ioException) {
ioException.printStackTrace();
}
}
}
};
@@ -405,9 +418,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity
}
Log.e(TAG, "Starting file export with: " + uri.toString());
startExport(writer, uri);
writer.close();
startExport(writer, uri, true);
}
else
{
@@ -423,9 +434,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity
Log.e(TAG, "Starting file import with: " + uri.toString());
startImport(reader, uri, importDataFormat, password);
reader.close();
startImport(reader, uri, importDataFormat, password, true);
}
}
catch(IOException e)