improve naming of proof zip files to include formatted datetime and PGP key id

Author: n8fr8

android-libproofmode/src/main/java/org/witness/proofmode/crypto/PgpUtils.java

@@ -14,6 +14,7 @@
 import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
 import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
+import org.bouncycastle.jcajce.provider.symmetric.util.PBE;
 import org.bouncycastle.openpgp.PGPCompressedDataGenerator;
 import org.bouncycastle.openpgp.PGPEncryptedData;
 import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
@@ -191,10 +192,10 @@ public String getPublicKey () throws IOException {
         ArmoredOutputStream armoredStreamPkr = new ArmoredOutputStream(baosPkr);
         pkr.encode(armoredStreamPkr);
         armoredStreamPkr.close();
+
         return new String(baosPkr.toByteArray(), Charset.defaultCharset());
     }
 
-
     public final static String genPGPPrivKey (PGPKeyRingGenerator krgen) throws IOException {
             // String pgpPublicKey = PgpUtils.genPGPPublicKey(krgen);
             //DetachedSignatureProcessor.createSignature(pgpSecretKey, )

app/src/main/java/org/witness/proofmode/ShareProofActivity.java

@@ -387,8 +387,16 @@ else if (Intent.ACTION_SEND.equals(action)) {
             else {
 
                 File fileFolder = MediaWatcher.getHashStorageDir(this,"zip");
-                File fileZip = new File(fileFolder,"proofmode." + new Date().getTime() + ".zip");
-                zip(shareUris,fileZip);
+
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss");
+                String dateString = sdf.format(new Date());
+
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+                PgpUtils pu = PgpUtils.getInstance(this,prefs.getString("password",PgpUtils.DEFAULT_PASSWORD));
+                String userId = pu.getPublicKeyFingerprint();
+
+                File fileZip = new File(fileFolder,"proofmode-" + userId + "-" + dateString + ".zip");
+                zipProof(shareUris,fileZip);
 
                 Uri uriZip = FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID + ".provider",fileZip);
 
@@ -866,7 +874,7 @@ private void askForPermission(String permission, Integer requestCode) {
 
     private final static int BUFFER = 1024*8;
 
-    public void zip(ArrayList<Uri> uris, File fileZip) {
+    public void zipProof(ArrayList<Uri> uris, File fileZip) {
         try {
             BufferedInputStream origin;
             FileOutputStream dest = new FileOutputStream(fileZip);