add "Share Proof Only" option for #11

guardianproject · Mar 1, 2017 · 42f51e1 · 42f51e1
1 parent 42bf118
commit 42f51e1
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/app/src/main/java/org/witness/proofmode/ShareProofActivity.java b/app/src/main/java/org/witness/proofmode/ShareProofActivity.java
@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
     protected void onResume() {
         super.onResume();
 
-        CharSequence items[] = {"Share Proof and Media","Notarize Only"};
+        CharSequence items[] = {"Share Proof Only","Share Proof with Media","Notarize Only"};
 
         new AlertDialog.Builder(this).setItems(items, new DialogInterface.OnClickListener() {
             @Override
@@ -48,20 +48,25 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 {
                     case 0:
 
-                        shareProof (false);
+                        shareProof (false, true);
 
                         break;
                     case 1:
 
-                        shareProof (true);
+                        shareProof (true, true);
+
+                        break;
+                    case 2:
+
+                        shareProof (false, false);
 
                         break;
                 }
             }
         }).show();
     }
 
-    private void shareProof (boolean notarizeOnly)
+    private void shareProof (boolean shareMedia, boolean shareProof)
     {
         // Get intent, action and MIME type
         Intent intent = getIntent();
@@ -91,7 +96,7 @@ private void shareProof (boolean notarizeOnly)
 
             for (Uri mediaUri : mediaUris)
             {
-                processUri (mediaUri, shareUris, shareText, fBatchProofOut);
+                processUri (mediaUri, shareUris, shareText, fBatchProofOut, shareMedia);
             }
 
 
@@ -109,7 +114,7 @@ private void shareProof (boolean notarizeOnly)
                 mediaUri = intent.getData();
 
             if (mediaUri != null)
-                processUri (mediaUri, shareUris, shareText, null);
+                processUri (mediaUri, shareUris, shareText, null, shareMedia);
 
 
         }
@@ -118,7 +123,7 @@ private void shareProof (boolean notarizeOnly)
 
         if (shareUris.size() > 0) {
 
-            if (notarizeOnly)
+            if (!shareProof)
             {
                 shareIntent = new Intent(Intent.ACTION_SEND);
                 shareIntent.putExtra(Intent.EXTRA_TEXT, shareText.toString());
@@ -140,7 +145,7 @@ private void shareProof (boolean notarizeOnly)
         finish();
     }
 
-    private void processUri (Uri mediaUri, ArrayList<Uri> shareUris, StringBuffer sb, PrintWriter fBatchProofOut)
+    private void processUri (Uri mediaUri, ArrayList<Uri> shareUris, StringBuffer sb, PrintWriter fBatchProofOut, boolean shareMedia)
     {
         Cursor cursor = getContentResolver().query(mediaUri,      null,null, null, null);
 
@@ -186,8 +191,10 @@ private void processUri (Uri mediaUri, ArrayList<Uri> shareUris, StringBuffer sb
                     sb.append("\n\n");
                     sb.append("This proof is signed by PGP key 0x" + fingerprint);
 
-                    shareUris.add(Uri.fromFile(new File(mediaPath))); // Add your image URIs here
-                    shareUris.add(Uri.fromFile(fileMediaSig)); // Add your image URIs here
+                    if (shareMedia) {
+                        shareUris.add(Uri.fromFile(new File(mediaPath))); // Add your image URIs here
+                        shareUris.add(Uri.fromFile(fileMediaSig)); // Add your image URIs here
+                    }
                     shareUris.add(Uri.fromFile(fileMediaProof));
                     shareUris.add(Uri.fromFile(fileMediaProofSig));