diff options
Diffstat (limited to 'src/eu/deki/paste/MainActivity.java')
| -rw-r--r-- | src/eu/deki/paste/MainActivity.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/eu/deki/paste/MainActivity.java b/src/eu/deki/paste/MainActivity.java index bc2ffa8..688c305 100644 --- a/src/eu/deki/paste/MainActivity.java +++ b/src/eu/deki/paste/MainActivity.java @@ -18,12 +18,13 @@ import java.io.InputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.FileNotFoundException; +import eu.deki.paste.PasteTask; import eu.deki.paste.DekiEuPaste; /* * TODO: - * - change supported expiration dates based on selected paste service * - menu: open browser with url? + * - more paste services */ public class MainActivity extends Activity @@ -31,6 +32,7 @@ public class MainActivity extends Activity private EditText titleText; private EditText contentText; private Spinner expirationSpinner; + private PasteTask pasteTask; @Override public void onCreate(Bundle savedInstanceState) @@ -42,8 +44,9 @@ public class MainActivity extends Activity contentText = (EditText) findViewById(R.id.paste_content); expirationSpinner = (Spinner) findViewById(R.id.expiration); - ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.expiration_array, android.R.layout.simple_spinner_item); - //adapter.setDropDownViewResource(android.R.layout.simple_spinner_item); + pasteTask = new DekiEuPaste(this); + + ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, pasteTask.getExpirationTimes()); expirationSpinner.setAdapter(adapter); Intent intent = getIntent(); @@ -110,7 +113,14 @@ public class MainActivity extends Activity { // TODO: check network status? - new DekiEuPaste(this).execute(titleText.getText().toString(), contentText.getText().toString(), "1hour"); + String title = titleText.getText().toString(); + String content = contentText.getText().toString(); + String expiration = expirationSpinner.getSelectedItem().toString(); + + pasteTask.execute(title, content, expiration); + + // new instance, because task must only be executed once + pasteTask = new DekiEuPaste(this); } } |