mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added minimal notifications for upload & completion

Browse source
This commit is contained in:
YuviPanda 2012-10-07 17:48:05 +05:30
parent 1b512f1e83
commit 6e60e27f9e
2 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/values/strings.xml
View file

@ -14,5 +14,9 @@
<string name="upload_overlay_title">Upload to Commons</string> <string name="upload_overlay_title">Upload to Commons</string>
<string name="login_success">Login success!</string> <string name="login_success">Login success!</string>
<string name="login_failed">Login failed!</string> <string name="login_failed">Login failed!</string>
<string name="uploading_title">Uploading photo</string>
<string name="uploading_message">More witty text here!</string>
<string name="uploading_success">Upload succeeded!</string>
<string name="uploading_failed">Upload failed!</string>
</resources> </resources>

74
src/org/wikimedia/commons/ShareActivity.java
View file

@ -1,28 +1,16 @@
package org.wikimedia.commons; package org.wikimedia.commons;
import java.io.*; import java.io.*;
import java.net.*;
import java.util.concurrent.ExecutionException;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.mediawiki.api.ApiResult; import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi; import org.mediawiki.api.MWApi;
import org.w3c.dom.Document;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.provider.MediaStore; import android.app.*;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.*;
import android.util.Log; import android.util.Log;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
@ -41,7 +29,8 @@ public class ShareActivity extends Activity {
class UploadImageTask extends AsyncTask<String, Integer, String> { class UploadImageTask extends AsyncTask<String, Integer, String> {
MWApi api; MWApi api;
Context context; Activity context;
ProgressDialog dialog;
@Override @Override
protected String doInBackground(String... params) { protected String doInBackground(String... params) {
@ -62,17 +51,17 @@ public class ShareActivity extends Activity {
try { try {
ApiResult result = api.upload(filename, file, text, comment); ApiResult result = api.upload(filename, file, text, comment);
Document document = (Document)result.getDocument(); // Document document = (Document)result.getDocument();
StringWriter wr = new StringWriter(); // StringWriter wr = new StringWriter();
try { // try {
Transformer trans = TransformerFactory.newInstance().newTransformer(); // Transformer trans = TransformerFactory.newInstance().newTransformer();
trans.transform(new DOMSource(result.getDocument()), new StreamResult(wr)); // trans.transform(new DOMSource(result.getDocument()), new StreamResult(wr));
String res = wr.toString(); // String res = wr.toString();
return res; // return res;
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
//FUCK YOU YOU SON OF A LEMON PARTY // //FUCK YOU YOU SON OF A LEMON PARTY
} // }
// DOMImplementationLS domImplLS = (DOMImplementationLS) document // DOMImplementationLS domImplLS = (DOMImplementationLS) document
// .getImplementation(); // .getImplementation();
@ -86,10 +75,34 @@ public class ShareActivity extends Activity {
} }
} }
UploadImageTask(MWApi api, Context context) { UploadImageTask(MWApi api, Activity context) {
this.api = api; this.api = api;
this.context = context; this.context = context;
} }
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
if(result.equals("Success")) {
dialog.hide();
Toast successToast = Toast.makeText(context, R.string.uploading_success, Toast.LENGTH_LONG);
successToast.show();
context.finish();
} else {
dialog.hide();
Toast failureToast = Toast.makeText(context, R.string.uploading_failed, Toast.LENGTH_LONG);
failureToast.show();
}
}
@Override
protected void onPreExecute() {
super.onPreExecute();
dialog = new ProgressDialog(context);
dialog.setTitle(R.string.uploading_title);
dialog.setMessage(getString(R.string.uploading_message));
dialog.show();
}
} }
@Override @Override
@ -110,7 +123,7 @@ public class ShareActivity extends Activity {
Intent intent = getIntent(); Intent intent = getIntent();
final Context that = this; final Activity that = this;
if(intent.getAction().equals(Intent.ACTION_SEND)) { if(intent.getAction().equals(Intent.ACTION_SEND)) {
if(intent.getType().startsWith("image/")) { if(intent.getType().startsWith("image/")) {
@ -124,13 +137,6 @@ public class ShareActivity extends Activity {
UploadImageTask uploadImage = new UploadImageTask(app.getApi(), that); UploadImageTask uploadImage = new UploadImageTask(app.getApi(), that);
Log.d("Commons", "Starting upload, yo!"); Log.d("Commons", "Starting upload, yo!");
uploadImage.execute(imageUri.toString(), titleEdit.getText().toString(), descEdit.getText().toString(), "Mobile Upload represent!"); uploadImage.execute(imageUri.toString(), titleEdit.getText().toString(), descEdit.getText().toString(), "Mobile Upload represent!");
try {
String result = uploadImage.get();
Log.d("Commons", "Result is " + result);
} catch (Exception e) {
throw new RuntimeException(e);
}
} }
}); });
} }