From dbb7e98fa8be989d2266d552605f237becc6cf44 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 28 Dec 2023 22:05:45 -0500
Subject: [PATCH] Make the app smaller

Newer Bouncy Castle compresses some stuff:
https://github.com/bcgit/bc-java/commit/0aacc38aefe7e79a6d9cca76bd690c24671c3feb

Signed-off-by: Tad <tad@spotco.us>
---
 app/build.gradle                 |   4 ++--
 gradle/verification-keyring.gpg  | Bin 200958 -> 201969 bytes
 gradle/verification-metadata.xml |   1 +
 scripts/Main.java                |   4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 871d4e9..f3d3ff1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
             shrinkResources true
             minifyEnabled true
             zipAlignEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     lint {
@@ -30,6 +30,6 @@ android {
 
 dependencies {
     implementation 'commons-io:commons-io:2.5'
-    implementation 'org.bouncycastle:bcpg-jdk15to18:1.73'
+    implementation 'org.bouncycastle:bcpg-jdk15to18:1.77'
     implementation 'com.google.guava:guava:33.0.0-jre'
 }
diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg
index 8c7f784345cf150704c91b07f96b470bf9e16fbd..ceee96ceb9485eb0ea6dfe783eb58a05835a3f7b 100644
GIT binary patch
delta 941
zcmV;e15*6{p$ze<41k0IgaWh!{t$ne0gVJ?fADny3;@abUR8lL#T$%OBmHaBw!ft{
z=m7{v$de>h(Nb_=5we>!?N!Jk#vne(pEy-H<WBBH#!pPJG2~rt#)d#xYgZ#Z9pHqD
zhK9we;rxx4yH0xv1d~;IjqdDjc!?*=iTH`)t$Q~1gh&%oinH1P_r#trclv(>FLr(N
zR&dXJ@1}(9G?(|p<Z0?2-_YAVmMK&%-B>h7uBnCXmuOk?agW{ksr%emm#Q0~n~N8f
zz&`p1(zj9dE5CrIqHJH>u<y_{7EzNt=c1aXY7@SGJ0v|TJr_>%e;Q%l6DSj`(I+r8
z>(mvqKTqzrMHiY&Nwk&VE-rs?P$}HQ2)<H~lEVrv@BQof;9=#gq{S*dI@TWJ6U`}P
zs1hUDUXX|7XzKMkS32ltX7oj=w07cUv*+S}4u+LKdT<gEm&U$TjaM~)$O-Tb_+f+P
z#X+2x$M=&dGrnFI<Z#GrcKt93e)g+yLXB+{4{n$}gKPgAO3Z7Wmt;qiF#tM}SiwC+
zkpx*q#Q+fj00FQJ003ujX8`~J00000v}ROjWgtvtXK8P4Aa7<MbZBKDLT`0$V|gG$
zVRLkBWgtmzV=k9b2m(ShunYhIXK-f%00000004;r)C3a&3IIM9Aq0C88+NDdZ06<)
z)fa^66R6{-NWcXGWPk8=lj@Hpe}w51sN<(dz>{JN|8vw*9mBNer#l;Yhxdn*s3Q$a
zI9iEP3@G>!!n!rm`fh~c-9`K)#qVdauWbxyuj`8{QIG?EbMZ9(rbtdDYv=BB3Hgsw
zu_7lBw_S5Y@7@xfuc#JitE~g}owt5~;^XzkxT|NugfYpY>%Ku+0ZK|^e=w`<r8R!q
zg?vw?D<%P^ge{4^Pd2G-D$m_tLI(gNo?*6rkA@kY-jK3gSA;uN0gT97tpMI|@D4MU
zOxBRuZ7N@kYa5l`wyEJlKc~QJWF%F|kFiD72?%j$u#f~9PZng{T_MI(Yh{hAtI$N9
zxv((6r13B3pV$F-YT}}8f0DLFLi<o}{|>=Rm)22lSj?V$({xpk=YH`vp1W+PT}#h3
z`{IsdPSx5IUS94Km)8RkW*bkm^=@n}SM(?wU9Amc%vBj`&SE_XmkiX!Xg%HTL<jBI
zuU~WMWQOY1rlKQkl_SYHFeW2F^a*S@ff<{o#tA0yo@k)v6_FoB7j#7EzcY&`#3~Cq
PIMzUEum%7FXK-f#?P9nz

delta 15
WcmeyklIPz-o`x327N#xC{{#R$0S2M~

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4136aa4..016cbf6 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -48,6 +48,7 @@
          <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
          <trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
          <trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
+         <trusted-key id="7b121b76a7ed6ce6e60ad51784e913a8e3a748c0" group="org.bouncycastle"/>
          <trusted-key id="7e22d50a7ebd9d2cd269b2d4056aca74d46000bf" group="io.netty"/>
          <trusted-key id="7f36e793ae3252e5d9e9b98fee9e7dc9d92fc896" group="com.google.errorprone"/>
          <trusted-key id="8254180bfc943b816e0b5e2e5e2f2b3d474efe6b" group="it.unimi.dsi" name="fastutil" version="8.4.0"/>
diff --git a/scripts/Main.java b/scripts/Main.java
index 9784e75..2c8d80c 100644
--- a/scripts/Main.java
+++ b/scripts/Main.java
@@ -65,8 +65,8 @@ public class Main {
             if(exclusionDatabase.exists()) {
                 Scanner s = new Scanner(exclusionDatabase);
                 while(s.hasNextLine()) {
-                    String line = s.nextLine().trim();
-                    if(!line.startsWith("#") && (line.length() == 32 || line.length() == 40 || line.length() == 64)) {
+                    String line = s.nextLine().trim().toLowerCase();
+                    if(!line.startsWith("#") && isHexadecimal(line) && (line.length() == 32 || line.length() == 40 || line.length() == 64)) {
                         arrExclusions.add(line);
                     }
                 }