commit 528642149d6c769a9e00380719675d0ac0e66ae5 Author: Nathan Freitas nathan@freitas.net Date: Fri Dec 27 13:24:25 2013 -0500

remove "ShareService" from projet (moving to separate app) --- src/org/torproject/android/share/ShareItem.java | 10 -- src/org/torproject/android/share/ShareService.java | 189 -------------------- 2 files changed, 199 deletions(-)

diff --git a/src/org/torproject/android/share/ShareItem.java b/src/org/torproject/android/share/ShareItem.java deleted file mode 100644 index 06ec235..0000000 --- a/src/org/torproject/android/share/ShareItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.torproject.android.share; - -import android.net.Uri; - -public class ShareItem { - - public String mContentType; - public long mContentLength; - public Uri mUriData; -} diff --git a/src/org/torproject/android/share/ShareService.java b/src/org/torproject/android/share/ShareService.java deleted file mode 100644 index 163db24..0000000 --- a/src/org/torproject/android/share/ShareService.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.torproject.android.share; - -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.HashMap; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - -import org.simpleframework.http.Path; -import org.simpleframework.http.Request; -import org.simpleframework.http.Response; -import org.simpleframework.http.core.Container; -import org.simpleframework.http.core.ContainerServer; -import org.simpleframework.transport.Server; -import org.simpleframework.transport.connect.Connection; -import org.simpleframework.transport.connect.SocketConnection; - -import android.content.ContentResolver; -import android.content.Context; -import android.content.res.AssetFileDescriptor; -import android.database.Cursor; -import android.provider.MediaStore; -import android.util.Log; - -public class ShareService implements Container, Runnable { - - private final static String TAG = "OrbotShare"; - - private final static String LOCALHOST = "127.0.0.1"; - private int mPort = -1; - private Thread thread = null; - - public static class Task implements Runnable { - - private final Response response; - private final Request request; - - public Task(Request request, Response response) { - this.response = response; - this.request = request; - } - - public void run() { - try { - - Path path = request.getPath(); - String rPath = path.toString(); - if (rPath.length() > 0) - rPath = rPath.substring(1); - - ShareItem sItem = null; - - if (sShareItems != null) - sItem = sShareItems.get(rPath); - - if (sItem != null) - { - - long time = System.currentTimeMillis(); - - response.setValue("Server", "OrbotShare/1.0 (Orbot 0.0.12-alpha)"); - response.setDate("Date", time); - response.setDate("Last-Modified", time); - response.setValue("Content-Type", sItem.mContentType); - - - ContentResolver cr = sContext.getContentResolver(); - InputStream is = cr.openInputStream(sItem.mUriData); - - AssetFileDescriptor fileDesc = cr.openAssetFileDescriptor(sItem.mUriData, "r"); - fileDesc.getLength(); - - response.setValue("Content-Length", fileDesc.getLength()+""); - - String fileName = rPath; - - String scheme = sItem.mUriData.getScheme(); - if (scheme.equals("file")) { - fileName = sItem.mUriData.getLastPathSegment(); - } - else if (scheme.equals("content")) { - String[] proj = { MediaStore.Images.Media.TITLE }; - Cursor cursor = cr.query(sItem.mUriData, proj, null, null, null); - if (cursor != null && cursor.getCount() != 0) { - int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.TITLE); - cursor.moveToFirst(); - fileName = cursor.getString(columnIndex); - } - } - - //force file to be downloaded - response.setValue("Content-Disposition","attachment; filename=" + fileName); - - BufferedOutputStream bos = new BufferedOutputStream(response.getOutputStream()); - - byte[] buffer = new byte[1024]; - int len = -1; - while ( (len = is.read(buffer)) != -1) - { - bos.write(buffer, 0, len); - } - - bos.flush(); - bos.close(); - } - else - { - response.setCode(404); - response.close(); - } - - } catch(Exception e) { - Log.e(TAG,"error handling request",e); - try { - response.setCode(500); - response.close(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - } - } - - public ShareService(int size, Context context) { - this.executor = Executors.newFixedThreadPool(size); - sContext = context; - } - - public void handle(Request request, Response response) { - Task task = new Task(request, response); - - executor.execute(task); - } - - - public void startService (int port) throws Exception { - - mPort = port; - thread = new Thread(this); - thread.start(); - } - - public void run () - { - try - { - mServer = new ContainerServer(this); - mConnection = new SocketConnection(mServer); - SocketAddress address = new InetSocketAddress("0.0.0.0", mPort); - - mConnection.connect(address); - } - catch (Exception e) - { - Log.e(TAG,"error starting share service!",e); - } - } - - public void stopService () throws Exception { - mConnection.close(); - } - - public synchronized String addShare (ShareItem sItem) - { - if (sShareItems == null) - { - sShareItems = new HashMap<String,ShareItem>(); - - } - - String guid = java.util.UUID.randomUUID().toString().substring(0,6);//short guid - - sShareItems.put (guid, sItem); - - return guid; - } - - private final Executor executor; - - private Server mServer; - private Connection mConnection; - - private static HashMap<String, ShareItem> sShareItems; - private static Context sContext; -} \ No newline at end of file