From 3679b9a48a27b5171e87ca02847a3b07d826ec3b Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 14 Oct 2018 11:00:02 -0700 Subject: [PATCH 1/4] Update gradle and android plugin --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 74f0fa91b..e95b2f8d5 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b595a5e42..7495a5e82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 25 19:10:53 EST 2017 +#Wed Jun 27 14:32:00 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip From b8311044db5a279a40eb9311a040eb1e85cc2127 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 14 Oct 2018 11:24:15 -0700 Subject: [PATCH 2/4] Update class file location for FindBugs Gradle now places the compiled class file under a different path. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5bc1f7987..66efd316a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,7 +61,7 @@ task findbugs(type: FindBugs, dependsOn: 'assembleDebug') { description 'Run findbugs' group 'verification' - classes = fileTree('build/intermediates/classes/debug/') + classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes') source = fileTree('src/main/java') classpath = files() From 5619c1c0030d1776434d48af246e5139069c8375 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 14 Oct 2018 11:03:45 -0700 Subject: [PATCH 3/4] Revert "Remove unneeded code" The log statement here was misleading. This code is responsible for receiving a barcode that a user typed in manually. This reverts commit cafa09a86a70ce1f0eefbc1f87f9db8c0897ff24. --- .../java/protect/card_locker/LoyaltyCardEditActivity.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index d0e154705..da8a3760d 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -449,6 +449,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity format = result.getFormatName(); } + if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK) + { + Log.i(TAG, "Received barcode information from capture"); + + contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS); + format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT); + } + if(contents != null && contents.isEmpty() == false && format != null && format.isEmpty() == false) { From 866eaea6800a629694864314b9bdddbb82f37fb6 Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 14 Oct 2018 11:07:04 -0700 Subject: [PATCH 4/4] Correct log statement when entering barcode manually --- .../main/java/protect/card_locker/LoyaltyCardEditActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index da8a3760d..802f3cd28 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -451,7 +451,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK) { - Log.i(TAG, "Received barcode information from capture"); + Log.i(TAG, "Received barcode information from typing it"); contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS); format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);