Merge pull request #181 from brarcher/pre-v0.18

Update for v0.18
2025-12-26 08:37:54 -05:00 · 2018-01-19 23:36:49 -05:00 · 2018-01-19 23:16:15 -05:00 · 2018-01-19 23:09:28 -05:00 · 2018-01-19 22:57:25 -05:00 · 2018-01-19 22:57:25 -05:00
7 changed files with 36 additions and 47 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ install:
 - echo y | android update sdk -u -a -t tools
 - echo y | android update sdk -u -a -t platform-tools
 - echo y | android update sdk -u -a -t build-tools-26.0.2
- echo y | android update sdk -u -a -t android-27
+- yes | sdkmanager "platforms;android-27"
 - echo y | android update sdk -u -a -t extra-google-m2repository
 - echo y | android update sdk -u -a -t extra-android-m2repository

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v0.17 (2018-01-11)
+
+Changes:
+- Fix issue on Android SDK 24+ where using the file chooser import option would cause a crash. (https://github.com/brarcher/loyalty-card-locker/pull/170)
+- New icon and color scheme. (https://github.com/brarcher/loyalty-card-locker/pull/171)
+
 ## v0.16 (2017-11-29)

 Changes:
--- a/README.md
+++ b/README.md
@@ -25,13 +25,13 @@ proposed changes.

 # Screenshots

-[<img src="https://user-images.githubusercontent.com/5264535/27416124-79b09162-56d9-11e7-967b-8923177dc228.png" width=250>](https://user-images.githubusercontent.com/5264535/27416124-79b09162-56d9-11e7-967b-8923177dc228.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416127-7baea332-56d9-11e7-8a10-5be90bb02225.png" width=250>](https://user-images.githubusercontent.com/5264535/27416127-7baea332-56d9-11e7-8a10-5be90bb02225.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416128-7d50f7b2-56d9-11e7-9833-1dd962f9cf66.png" width=250>](https://user-images.githubusercontent.com/5264535/27416128-7d50f7b2-56d9-11e7-9833-1dd962f9cf66.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)

-[<img src="https://user-images.githubusercontent.com/5264535/27416132-7ea6272c-56d9-11e7-9a52-d73424bf902c.png" width=250>](https://user-images.githubusercontent.com/5264535/27416132-7ea6272c-56d9-11e7-9a52-d73424bf902c.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416137-800aee90-56d9-11e7-9cc9-2a7dc63bb4fb.png" width=250>](https://user-images.githubusercontent.com/5264535/27416137-800aee90-56d9-11e7-9cc9-2a7dc63bb4fb.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416140-82d8211a-56d9-11e7-8031-c71d3077bdc6.png" width=250>](https://user-images.githubusercontent.com/5264535/27416140-82d8211a-56d9-11e7-8031-c71d3077bdc6.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)

 # Building

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 17
        targetSdkVersion 27
-        versionCode 18
-        versionName "0.17"
+        versionCode 19
+        versionName "0.18"
    }
    buildTypes {
        release {
@@ -47,7 +47,7 @@ dependencies {
    compile 'com.android.support:design:27.0.2'
    compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
    compile 'com.google.zxing:core:3.3.0'
-    compile 'org.apache.commons:commons-csv:1.2'
+    compile 'org.apache.commons:commons-csv:1.5'
    compile group: 'com.google.guava', name: 'guava', version: '20.0'
    compile 'com.github.apl-devs:appintro:v4.2.0'
    testCompile 'junit:junit:4.12'
--- a/app/src/main/java/protect/card_locker/CsvDatabaseImporter.java
+++ b/app/src/main/java/protect/card_locker/CsvDatabaseImporter.java
@@ -40,7 +40,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
            parser.close();
            database.setTransactionSuccessful();
        }
-        catch(IllegalArgumentException e)
+        catch(IllegalArgumentException|IllegalStateException e)
        {
            throw new FormatException("Issue parsing CSV data", e);
        }
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -235,33 +235,6 @@ public class ImportExportActivity extends AppCompatActivity
        return super.onOptionsItemSelected(item);
    }

-    private String fileNameFromUri(Uri uri)
-    {
-        if("file".equals(uri.getScheme()))
-        {
-            return uri.getPath();
-        }
-
-        Cursor returnCursor =
-                getContentResolver().query(uri, null, null, null, null);
-        if(returnCursor == null)
-        {
-            return null;
-        }
-
-        int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-        if(returnCursor.moveToFirst() == false)
-        {
-            returnCursor.close();
-            return null;
-        }
-
-        String name = returnCursor.getString(nameIndex);
-        returnCursor.close();
-
-        return name;
-    }
-
    private void onImportComplete(boolean success, Uri path)
    {
        AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -276,15 +249,10 @@ public class ImportExportActivity extends AppCompatActivity
        }

        int messageId = success ? R.string.importedFrom : R.string.importFailed;
-
        final String template = getResources().getString(messageId);

        // Get the filename of the file being imported
-        String filename = fileNameFromUri(path);
-        if(filename == null)
-        {
-            filename = "(unknown)";
-        }
+        String filename = path.toString();

        final String message = String.format(template, filename);
        builder.setMessage(message);
@@ -412,13 +380,24 @@ public class ImportExportActivity extends AppCompatActivity

        try
        {
-            InputStream reader = getContentResolver().openInputStream(uri);
+            InputStream reader;
+
+            if(uri.getScheme() != null)
+            {
+                reader = getContentResolver().openInputStream(uri);
+            }
+            else
+            {
+                reader = new FileInputStream(new File(uri.toString()));
+            }
+
            Log.e(TAG, "Starting file import with: " + uri.toString());
            startImport(reader, uri);
        }
-        catch (FileNotFoundException e)
+        catch(FileNotFoundException e)
        {
            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(false, uri);
        }
    }
 }
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -198,7 +198,11 @@ public class ImportExportTest

            clearDatabase();

-            String corruptEntry = "ThisStringIsLikelyNotPartOfAnyFormat";
+            // commons-csv would throw a RuntimeException if an entry was quotes but had
+            // content after. For example:
+            //   abc,def,""abc,abc
+            //             ^ after the quote there should only be a , \n or EOF
+            String corruptEntry = "ThisStringIsLikelyNotPartOfAnyFormat,\"\"a";

            ByteArrayInputStream inData = new ByteArrayInputStream((outData.toString() + corruptEntry).getBytes());
            InputStreamReader inStream = new InputStreamReader(inData);
Author	SHA1	Message	Date
Branden Archer	f775f9224b	Merge pull request #181 from brarcher/pre-v0.18 Update for v0.18	2018-01-19 23:36:49 -05:00
Branden Archer	17acb8370c	Update for v0.18	2018-01-19 23:16:15 -05:00
Branden Archer	23766fe9f0	Merge pull request #180 from brarcher/import-from-filesystem Import from filesystem	2018-01-19 23:09:28 -05:00
Branden Archer	f1b0a26591	Allow file paths when importing directly from filesystem The import path directly from the file system may not result in using a content:// or file:// Uri, but instead a file system path. If this occurs, attempt to use a FileInputStream to read the contents.	2018-01-19 22:57:25 -05:00
Branden Archer	f1b2c0d93d	Report Uri after import The filename from Uri code was removed in a previous commit. To give some feedback about what was imported, the Uri itself is reported.	2018-01-19 22:57:25 -05:00
Branden Archer	4034997d7f	Merge pull request #179 from brarcher/import-crash Do not bother to show file name after an import	2018-01-19 08:27:36 -05:00
Branden Archer	d3bbaf39f4	Do not bother to show file name after an import It was observed by one user that the Uri to filename lookup failed with an IllegalStateException. The code which converts a Uri to a file path may not be that great, especially now that the app is expected to not receive file Uris. Instead of determining the best way to lookup the file names, as it is not that important it will be removed.	2018-01-19 00:12:36 -05:00
Branden Archer	ae7684921f	Merge pull request #177 from brarcher/csv-crash Fix crash on some corruption when importing CSV	2018-01-17 08:31:21 -05:00
Branden Archer	e73974536c	Update how SDK 27 is acceptd on Travis-CI There are issues with using the "andorid" tool to accept some licenses on Travis-CI. The theory from Travis-CI is that the android binary is out of date. An alternative is using sdkmanager.	2018-01-17 08:04:26 -05:00
Branden Archer	43072e283f	Fix crash on some corruption when importing CSV Commons-CSV would throw a RuntimeException in some cases of bad CSV input. This was later changed to throwing an IllegalStateException. Updating to v1.5 to pick-up the change.	2018-01-16 22:04:36 -05:00
Branden Archer	a3a70d459b	Merge pull request #176 from brarcher/readme Update screenshots in README	2018-01-11 23:06:05 -05:00
Branden Archer	edfc91376f	Update screenshots in README The screenshots now use the images from the metadata folder in the repo.	2018-01-11 22:35:58 -05:00
Branden Archer	5fb68055ea	Merge pull request #175 from brarcher/changelog Update CHANGELOG	2018-01-11 22:24:43 -05:00
Branden Archer	085a3f10e7	Update CHANGELOG	2018-01-11 22:11:53 -05:00