Make send mini dump work with non Gmail Mail app, make google sending better placed

1 files changed, 117 insertions, 89 deletions

diff --git a/src/de/blinkt/openvpn/FileProvider.java b/src/de/blinkt/openvpn/FileProvider.java
index 1147ccf0..e86b544f 100644
--- a/src/de/blinkt/openvpn/FileProvider.java
+++ b/src/de/blinkt/openvpn/FileProvider.java
@@ -24,13 +24,15 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import android.content.ContentProvider;
-import android.content.ContentValues;
 import android.content.ContentProvider.PipeDataWriter;
+import android.content.ContentValues;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
+import android.provider.OpenableColumns;
 import android.util.Log;
 
 /**
@@ -38,92 +40,118 @@ import android.util.Log;
  * our .apk.
  */
 public class FileProvider extends ContentProvider
-        implements PipeDataWriter<InputStream> {
-    @Override
-    public boolean onCreate() {
-        return true;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        // Don't support queries.
-        return null;
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        // Don't support inserts.
-        return null;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        // Don't support deletes.
-        return 0;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        // Don't support updates.
-        return 0;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        // For this sample, assume all files are .apks.
-        return "application/octet-stream";
-    }
-
-    @Override
-    public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
-        // Try to open an asset with the given name.
-    	String path = uri.getPath();
-    	if(path.startsWith("/"))
-    		path = path.replaceFirst("/", "");       
-    	
-    	// I think this already random enough, no need for magic secure cookies
-    	// 1f9563a4-a1f5-2165-255f2219-111823ef.dmp
-    	if (!path.matches("^[0-9a-z-.]*$"))
-    		throw new FileNotFoundException("url not in expect format " + uri);
-
-        try {
-        	
-        	File cachedir = getContext().getCacheDir();
-        	File dumpfile = new File(cachedir,path);
-            InputStream is = new FileInputStream(dumpfile);
-            // Start a new thread that pipes the stream data back to the caller.
-            return new AssetFileDescriptor(
-                    openPipeHelper(uri, null, null, is, this), 0,
-                    dumpfile.length());
-        } catch (IOException e) {
-            FileNotFoundException fnf = new FileNotFoundException("Unable to open minidump " + uri);
-            throw fnf;
-        }
-    }
-
-    @Override
-    public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType,
-            Bundle opts, InputStream args) {
-        // Transfer data from the asset to the pipe the client is reading.
-        byte[] buffer = new byte[8192];
-        int n;
-        FileOutputStream fout = new FileOutputStream(output.getFileDescriptor());
-        try {
-            while ((n=args.read(buffer)) >= 0) {
-                fout.write(buffer, 0, n);
-            }
-        } catch (IOException e) {
-            Log.i("OpenVPNFileProvider", "Failed transferring", e);
-        } finally {
-            try {
-                args.close();
-            } catch (IOException e) {
-            }
-            try {
-                fout.close();
-            } catch (IOException e) {
-            }
-        }
-    }
+implements PipeDataWriter<InputStream> {
+	@Override
+	public boolean onCreate() {
+		return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+			String sortOrder) {
+		try {
+			File dumpfile = getFileFromURI(uri);
+
+
+			MatrixCursor c = new MatrixCursor(projection);
+
+			Object[] row = new Object[projection.length];
+			int i=0;
+			for (String r:projection) {
+				if(r.equals(OpenableColumns.SIZE))
+					row[i] = dumpfile.length();
+				if(r.equals(OpenableColumns.DISPLAY_NAME))
+					row[i] = dumpfile.getName();
+				i++;
+			}
+			c.addRow(row);
+			return c;
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+			return null;
+		}
+
+
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values) {
+		// Don't support inserts.
+		return null;
+	}
+
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs) {
+		// Don't support deletes.
+		return 0;
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+		// Don't support updates.
+		return 0;
+	}
+
+	@Override
+	public String getType(Uri uri) {
+		// For this sample, assume all files are .apks.
+		return "application/octet-stream";
+	}
+
+	@Override
+	public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
+		File dumpfile = getFileFromURI(uri);
+
+		try {
+
+			InputStream is = new FileInputStream(dumpfile);
+			// Start a new thread that pipes the stream data back to the caller.
+			return new AssetFileDescriptor(
+					openPipeHelper(uri, null, null, is, this), 0,
+					dumpfile.length());
+		} catch (IOException e) {
+			FileNotFoundException fnf = new FileNotFoundException("Unable to open minidump " + uri);
+			throw fnf;
+		}
+	}
+
+	private File getFileFromURI(Uri uri) throws FileNotFoundException {
+		// Try to open an asset with the given name.
+		String path = uri.getPath();
+		if(path.startsWith("/"))
+			path = path.replaceFirst("/", "");       
+
+		// I think this already random enough, no need for magic secure cookies
+		// 1f9563a4-a1f5-2165-255f2219-111823ef.dmp
+		if (!path.matches("^[0-9a-z-.]*(dmp|dmp.log)$"))
+			throw new FileNotFoundException("url not in expect format " + uri);
+		File cachedir = getContext().getCacheDir();
+		File dumpfile = new File(cachedir,path);
+		return dumpfile;
+	}
+
+	@Override
+	public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType,
+			Bundle opts, InputStream args) {
+		// Transfer data from the asset to the pipe the client is reading.
+		byte[] buffer = new byte[8192];
+		int n;
+		FileOutputStream fout = new FileOutputStream(output.getFileDescriptor());
+		try {
+			while ((n=args.read(buffer)) >= 0) {
+				fout.write(buffer, 0, n);
+			}
+		} catch (IOException e) {
+			Log.i("OpenVPNFileProvider", "Failed transferring", e);
+		} finally {
+			try {
+				args.close();
+			} catch (IOException e) {
+			}
+			try {
+				fout.close();
+			} catch (IOException e) {
+			}
+		}
+	}
 }