]> Joshua Wise's Git repositories - dumload.git/blobdiff - src/com/joshuawise/dumload/Uploader.java
Add a progress bar.
[dumload.git] / src / com / joshuawise / dumload / Uploader.java
index 489040b8f305578b4238b35a8d76fa551e49d422..763e3f0d31e9c2d91d8ec9059cee91991aee6867 100644 (file)
@@ -1,6 +1,7 @@
 package com.joshuawise.dumload;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 
 import com.jcraft.jsch.*;
 import java.lang.Boolean;
@@ -23,15 +24,42 @@ import android.os.Messenger;
 import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
+import android.widget.RemoteViews;
 
 public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardInteractive {
        private Uri uri;
        private String homedir;
        private Thread me;
        private static final int HELPME_ID = 1;
+       private RemoteViews remote;
+       private int thenotifid;
+       private Notification thenotif;
+       private String headline;
+       
+       private InputStream is;
        
        public Object _theObject;
 
+       private void sayNullNotification(final String scroller, final String headline, final String description)
+       {
+               int bogon = (int)SystemClock.elapsedRealtime();
+               NotificationManager mNotificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+               Notification notification = new Notification(R.drawable.icon, scroller, System.currentTimeMillis());
+
+               Intent intent = new Intent(this, NotifSlave.class);
+                                       
+               intent.setAction("com.joshuawise.dumload.NotifSlave");
+               /* no extras to make the notifslave die */
+               intent.setData((Uri.parse("suckit://"+SystemClock.elapsedRealtime())));
+                               
+               PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, 0);
+               notification.defaults |= Notification.DEFAULT_VIBRATE;
+               notification.flags |= Notification.FLAG_AUTO_CANCEL;
+               notification.setLatestEventInfo(getApplicationContext(), headline, description, contentIntent);
+                               
+               mNotificationManager.notify(bogon, notification);
+       }
+
        private Object /* pick one type, and fixate on it */ dance(final String type, final String text)        /* for inside the thread */
        {
                final Uploader thisupl = this;
@@ -64,7 +92,7 @@ public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardI
                                
                                PendingIntent contentIntent = PendingIntent.getActivity(thisupl, 0, intent, 0);
                                notification.defaults |= Notification.DEFAULT_VIBRATE;
-                               notification.flags |= Notification.FLAG_AUTO_CANCEL | Notification.FLAG_ONGOING_EVENT | Notification.FLAG_NO_CLEAR;
+                               notification.flags |= Notification.FLAG_ONGOING_EVENT | Notification.FLAG_NO_CLEAR;
                                notification.setLatestEventInfo(getApplicationContext(), "I've been had!", "Dumload needs your input.", contentIntent);
                                
                                Log.e("Dumload.Uploader[thread]", "Notifying...");
@@ -145,10 +173,93 @@ public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardI
                for (i = 0; i < prompt.length; i++)
                {
                        responses[i] = (String) dance("password", "[" + dest + "]\n" + prompt[i]);
+                       if (responses[i] == null)
+                               return null;
                }
                return responses;
        }
        
+       private void expect_ack(InputStream in) throws Exception, java.io.IOException
+       {
+               int b = in.read();
+               
+               if (b == -1)
+               {
+                       throw new Exception("unexpected EOF from remote end");
+               }
+               
+               if (b == 1 /* error */ || b == 2 /* fatal error */)
+               {
+                       StringBuffer sb = new StringBuffer();
+                       int c = 0;
+                       
+                       while ((c = in.read()) != '\n')
+                               sb.append((char)c);
+                       
+                       throw new Exception("error from remote end: " + sb.toString());
+               }
+       }
+       
+       private void set_up_notif(final String _headline)
+       {
+               NotificationManager mNotificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+               thenotif = new Notification(R.drawable.icon, headline, System.currentTimeMillis());
+               thenotifid = (int)SystemClock.elapsedRealtime();
+
+               Intent intent = new Intent(this, NotifSlave.class);
+               
+               headline = _headline;
+                                       
+               intent.setAction("com.joshuawise.dumload.NotifSlave");
+               /* no extras to make the notifslave die */
+               intent.setData((Uri.parse("suckit://"+SystemClock.elapsedRealtime())));
+                               
+               PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, 0);
+               thenotif.defaults |= 0;
+               thenotif.flags |= Notification.FLAG_ONGOING_EVENT | Notification.FLAG_NO_CLEAR;
+               
+               remote = new RemoteViews(getPackageName(), R.layout.textnotif);
+               remote.setImageViewResource(R.id.image, R.drawable.icon);
+               remote.setTextViewText(R.id.headline, headline);
+               remote.setTextViewText(R.id.status, "Beginning upload...");
+               thenotif.contentView = remote;
+               thenotif.contentIntent = contentIntent;
+                               
+               mNotificationManager.notify(thenotifid, thenotif);
+       }
+       
+       private void destroy_notif()
+       {
+               NotificationManager mNotificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+               mNotificationManager.cancel(thenotifid);
+       }
+       
+       private void update_notif(String text)
+       {
+               NotificationManager mNotificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+               
+               remote = new RemoteViews(getPackageName(), R.layout.textnotif);
+               remote.setImageViewResource(R.id.image, R.drawable.icon);
+               remote.setTextViewText(R.id.headline, headline);
+               remote.setTextViewText(R.id.status, text);
+               thenotif.contentView = remote;
+               
+               mNotificationManager.notify(thenotifid, thenotif);
+       }
+       
+       private void update_notif(int n, int total)
+       {
+               NotificationManager mNotificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+               
+               remote = new RemoteViews(getPackageName(), R.layout.progressnotif);
+               remote.setImageViewResource(R.id.image, R.drawable.icon);
+               remote.setTextViewText(R.id.headline, headline);
+               remote.setProgressBar(R.id.status, total, n, false);
+               thenotif.contentView = remote;
+               
+               mNotificationManager.notify(thenotifid, thenotif);
+       }
+       
        @Override
        public void run()
        {
@@ -156,7 +267,13 @@ public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardI
                
                Log.e("Dumload.Uploader[thread]", "This brought to you from the new thread.");
                
+               set_up_notif("Dumload upload in progress");
+               
                try {
+                       say("Uploading "+(Integer.toString(is.available()))+" bytes");
+               
+                       update_notif("Connecting...");
+               
                        JSch jsch = new JSch();
                        jsch.setKnownHosts(homedir + "/known_hosts");
                        Session s = jsch.getSession("joshua", "nyus.joshuawise.com", 22);
@@ -164,17 +281,53 @@ public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardI
                        s.connect();
                        
                        Channel channel = s.openChannel("exec");
-                       ((ChannelExec)channel).setCommand("echo foo > /tmp/lol");
+                       ((ChannelExec)channel).setCommand("scp -t /tmp/lol");
                        channel.connect();
                        
-                       dance("message", "done");
+                       OutputStream scp_out = channel.getOutputStream();
+                       InputStream scp_in = channel.getInputStream();
+                       
+                       update_notif("Starting send...");
+                       
+                       /* Okay, BS out of the way.  Now go send the file. */
+                       expect_ack(scp_in);
+                       
+                       scp_out.write(("C0644 " + (Integer.toString(is.available())) + " lol\n").getBytes());
+                       scp_out.flush();
+                       
+                       expect_ack(scp_in);
+                       
+                       int total, nbytes;
+                       total = is.available();
+                       nbytes = 0;
+                       int len;
+                       byte[] buf = new byte[4096];
+                       while ((len = is.read(buf, 0, buf.length)) > 0)
+                       {
+                               scp_out.write(buf, 0, len);
+                               nbytes += len;
+                               update_notif(nbytes, total);
+                       }
+                       
+                       is.close();
+                       
+                       update_notif("Disconnecting...");
+                       
+                       scp_out.write("\0".getBytes());
+                       scp_out.flush();
+                       
+                       expect_ack(scp_in);
+                       
+                       sayNullNotification("Dumload upload complete", "Upload complete", "Dumload has finished uploading your file.");
 
                        channel.disconnect();
                        s.disconnect();
-               } catch (JSchException e) {
+               } catch (Exception e) {
                        Log.e("Dumload.uploader[thread]", "JSchException: "+(e.toString()));
+                       sayNullNotification("Dumload upload failed", "Upload failed", e.toString());
                }
                
+               destroy_notif();
                
                Log.e("Dumload.uploader[thread]", "And now I'm back to life!");
        }
@@ -196,12 +349,12 @@ public class Uploader extends Service implements Runnable, UserInfo, UIKeyboardI
                Log.e("Dumload.Uploader", "My path is "+homedir);
                
                try {
-                       InputStream is = getContentResolver().openInputStream(uri);
-                       shits = is.available();
+                       is = getContentResolver().openInputStream(uri);
                } catch (Exception e) {
+                       say("Failed to open input file.");
+                       return;
                }
                
-               say("Your shit was "+(Integer.toString(shits))+" bytes long");
                
                me = new Thread(this, "Uploader thread");
                me.start();
This page took 0.023162 seconds and 4 git commands to generate.