Fix Bluetooth share without breaking others

1 files changed, 13 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 710dbf8aa..161979ce3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -40,6 +40,8 @@ import org.sufficientlysecure.keychain.util.PRNGFixes;
 import org.sufficientlysecure.keychain.util.Preferences;
 import org.sufficientlysecure.keychain.util.TlsHelper;
 
+import java.io.File;
+import java.io.FilenameFilter;
 import java.security.Security;
 import java.util.HashMap;
 
@@ -88,6 +90,17 @@ public class KeychainApplication extends Application {
             }
         }
 
+        // Clean up leftover Bluetooth Share files
+        for (File toDelete : this.getExternalCacheDir().listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String filename) {
+                if (filename.matches("^key-[0-9a-fA-F]{8}\\.pgp\\.asc$")) {
+                    return true;
+                }
+                return false;
+            }
+        })) { toDelete.delete(); }
+
         brandGlowEffect(getApplicationContext(),
                 getApplicationContext().getResources().getColor(R.color.primary));