Fix port usage and always try to add the generated key

[dumload.git] / src / com / joshuawise / dumload / Dumload.java

diff --git a/src/com/joshuawise/dumload/Dumload.java b/src/com/joshuawise/dumload/Dumload.java
index f0919b78d4ec22fdc467b18e5e1c3f5dafd37758..f3317c43f2e93d8c410b0e1574cbd7ec280f05a0 100644 (file)
--- a/src/com/joshuawise/dumload/Dumload.java
+++ b/src/com/joshuawise/dumload/Dumload.java
@@ -1,21 +1,21 @@
 package com.joshuawise.dumload;
 
 package com.joshuawise.dumload;
 

-import java.io.InputStream;
-

 import android.app.Activity;
 import android.app.Activity;

-import android.app.Service;

 import android.content.Intent;
 import android.content.Intent;

+import android.content.SharedPreferences;

 import android.net.Uri;
 import android.os.Bundle;
 import android.net.Uri;
 import android.os.Bundle;

-import android.os.IBinder;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;

 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.TextView;
 import android.widget.Toast;

-import android.widget.TextView;
-import android.widget.Button;
-import android.view.View;
-import android.util.Log;

 
 public class Dumload extends Activity {
 
 public class Dumload extends Activity {

+       
+       private SharedPreferences prefs;
+       

        /** Called when the activity is first created. */
        @Override
        public void onCreate(Bundle savedInstanceState) {
        /** Called when the activity is first created. */
        @Override
        public void onCreate(Bundle savedInstanceState) {


@@ -33,12 +33,16 @@ public class Dumload extends Activity {
                super.onStart();
                final Dumload thisact = this;
                
                super.onStart();
                final Dumload thisact = this;
                

+               prefs = PreferenceManager.getDefaultSharedPreferences(this);
+               

                Intent i = getIntent(); /* i *am* not an intent! */
                
                if (!i.getAction().equals(Intent.ACTION_SEND))
                {
                Intent i = getIntent(); /* i *am* not an intent! */
                
                if (!i.getAction().equals(Intent.ACTION_SEND))
                {

-                       say("Unknown intent for dumload");
-                       this.finish();
+//                     say("Unknown intent for dumload");
+//                     this.finish();
+                       Intent pi = new Intent(this, Preferences.class);
+                       startActivity(pi);

                        return;
                }
                
                        return;
                }
                


@@ -68,7 +72,7 @@ public class Dumload extends Activity {
                
                
                ((TextView) findViewById(R.id.suckit)).setText("Where to?");
                
                
                ((TextView) findViewById(R.id.suckit)).setText("Where to?");

-               ((TextView) findViewById(R.id.entry)).setText("/var/www/" + uribase.substring(uribase.lastIndexOf("/") + 1) + ".jpg");
+               ((TextView) findViewById(R.id.entry)).setText(prefs.getString("defaultUploadPath", "/var/www/") + uribase.substring(uribase.lastIndexOf("/") + 1) + ".jpg");

                
        }
 }
\ No newline at end of file
                
        }
 }
\ No newline at end of file