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

Indentation fixing.

Browse source 
Unsure how it got so out of whack to begin with
This commit is contained in:
YuviPanda 2013-02-02 15:30:01 +05:30
parent da92ec7235
commit 569143e44b
1 changed files with 100 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

28
commons/src/main/java/org/wikimedia/commons/UploadService.java
View file

@ -53,6 +53,7 @@ public class UploadService extends IntentService {
public UploadService() { public UploadService() {
super("UploadService"); super("UploadService");
} }
// DO NOT HAVE NOTIFICATION ID OF 0 FOR ANYTHING // DO NOT HAVE NOTIFICATION ID OF 0 FOR ANYTHING
// See http://stackoverflow.com/questions/8725909/startforeground-does-not-show-my-notification // See http://stackoverflow.com/questions/8725909/startforeground-does-not-show-my-notification
// Seriously, Android? // Seriously, Android?
@ -77,6 +78,7 @@ public class UploadService extends IntentService {
this.notificationFinishingTitle = notificationFinishingTitle; this.notificationFinishingTitle = notificationFinishingTitle;
this.contribution = contribution; this.contribution = contribution;
} }
@Override @Override
public void onProgress(long transferred, long total) { public void onProgress(long transferred, long total) {
Log.d("Commons", String.format("Uploaded %d of %d", transferred, total)); Log.d("Commons", String.format("Uploaded %d of %d", transferred, total));
@ -96,7 +98,7 @@ public class UploadService extends IntentService {
curView.setTextViewText(R.id.uploadNotificationTitle, notificationFinishingTitle); curView.setTextViewText(R.id.uploadNotificationTitle, notificationFinishingTitle);
notificationManager.notify(NOTIFICATION_DOWNLOAD_IN_PROGRESS, curNotification); notificationManager.notify(NOTIFICATION_DOWNLOAD_IN_PROGRESS, curNotification);
} else { } else {
curNotification.contentView.setProgressBar(R.id.uploadNotificationProgress, 100, (int)(((double)transferred / (double)total) * 100), false); curNotification.contentView.setProgressBar(R.id.uploadNotificationProgress, 100, (int) (((double) transferred / (double) total) * 100), false);
notificationManager.notify(NOTIFICATION_DOWNLOAD_IN_PROGRESS, curNotification); notificationManager.notify(NOTIFICATION_DOWNLOAD_IN_PROGRESS, curNotification);
Intent mediaUploadProgressIntent = new Intent(INTENT_CONTRIBUTION_STATE_CHANGED); Intent mediaUploadProgressIntent = new Intent(INTENT_CONTRIBUTION_STATE_CHANGED);
@ -107,6 +109,7 @@ public class UploadService extends IntentService {
} }
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
@ -117,14 +120,14 @@ public class UploadService extends IntentService {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
app = (CommonsApplication)this.getApplicationContext(); app = (CommonsApplication) this.getApplicationContext();
contributionsProviderClient = this.getContentResolver().acquireContentProviderClient(ContributionsContentProvider.AUTHORITY); contributionsProviderClient = this.getContentResolver().acquireContentProviderClient(ContributionsContentProvider.AUTHORITY);
} }
private String getRealPathFromURI(Uri contentUri) { private String getRealPathFromURI(Uri contentUri) {
String[] proj = { MediaStore.Images.Media.DATA }; String[] proj = {MediaStore.Images.Media.DATA};
CursorLoader loader = new CursorLoader(this, contentUri, proj, null, null, null); CursorLoader loader = new CursorLoader(this, contentUri, proj, null, null, null);
Cursor cursor = loader.loadInBackground(); Cursor cursor = loader.loadInBackground();
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
@ -134,7 +137,7 @@ public class UploadService extends IntentService {
private Contribution mediaFromIntent(Intent intent) { private Contribution mediaFromIntent(Intent intent) {
Bundle extras = intent.getExtras(); Bundle extras = intent.getExtras();
Uri mediaUri = (Uri)extras.getParcelable(EXTRA_MEDIA_URI); Uri mediaUri = (Uri) extras.getParcelable(EXTRA_MEDIA_URI);
String filename = intent.getStringExtra(EXTRA_TARGET_FILENAME); String filename = intent.getStringExtra(EXTRA_TARGET_FILENAME);
String description = intent.getStringExtra(EXTRA_DESCRIPTION); String description = intent.getStringExtra(EXTRA_DESCRIPTION);
String editSummary = intent.getStringExtra(EXTRA_EDIT_SUMMARY); String editSummary = intent.getStringExtra(EXTRA_EDIT_SUMMARY);
@ -144,16 +147,16 @@ public class UploadService extends IntentService {
Long length = null; Long length = null;
try { try {
length = this.getContentResolver().openAssetFileDescriptor(mediaUri, "r").getLength(); length = this.getContentResolver().openAssetFileDescriptor(mediaUri, "r").getLength();
} catch (FileNotFoundException e) { } catch(FileNotFoundException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
Log.d("Commons", "MimeType is " + mimeType); Log.d("Commons", "MimeType is " + mimeType);
if (mimeType.startsWith("image/")) { if(mimeType.startsWith("image/")) {
Cursor cursor = this.getContentResolver().query(mediaUri, Cursor cursor = this.getContentResolver().query(mediaUri,
new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null); new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
if (cursor.getCount() != 0) { if(cursor.getCount() != 0) {
cursor.moveToFirst(); cursor.moveToFirst();
dateCreated = new Date(cursor.getLong(0)); dateCreated = new Date(cursor.getLong(0));
} }
@ -163,6 +166,7 @@ public class UploadService extends IntentService {
Contribution contribution = new Contribution(mediaUri, null, filename, description, null, length, dateCreated, null, app.getCurrentAccount().name, editSummary); Contribution contribution = new Contribution(mediaUri, null, filename, description, null, length, dateCreated, null, app.getCurrentAccount().name, editSummary);
return contribution; return contribution;
} }
@Override @Override
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
toUpload++; toUpload++;
@ -192,14 +196,14 @@ public class UploadService extends IntentService {
RemoteViews notificationView; RemoteViews notificationView;
Contribution contribution; Contribution contribution;
InputStream file = null; InputStream file = null;
contribution = (Contribution)intent.getSerializableExtra("dummy-data"); contribution = (Contribution) intent.getSerializableExtra("dummy-data");
String notificationTag = contribution.getLocalUri().toString(); String notificationTag = contribution.getLocalUri().toString();
try { try {
file = this.getContentResolver().openInputStream(contribution.getLocalUri()); file = this.getContentResolver().openInputStream(contribution.getLocalUri());
} catch (FileNotFoundException e) { } catch(FileNotFoundException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -241,7 +245,7 @@ public class UploadService extends IntentService {
contribution contribution
); );
result = api.upload(contribution.getFilename(), file, contribution.getDataLength(), contribution.getPageContents(), contribution.getEditSummary(), notificationUpdater); result = api.upload(contribution.getFilename(), file, contribution.getDataLength(), contribution.getPageContents(), contribution.getEditSummary(), notificationUpdater);
} catch (IOException e) { } catch(IOException e) {
Log.d("Commons", "I have a network fuckup"); Log.d("Commons", "I have a network fuckup");
stopForeground(true); stopForeground(true);
Notification failureNotification = new NotificationCompat.Builder(this).setAutoCancel(true) Notification failureNotification = new NotificationCompat.Builder(this).setAutoCancel(true)
@ -272,7 +276,7 @@ public class UploadService extends IntentService {
Date dateUploaded = null; Date dateUploaded = null;
try { try {
dateUploaded = isoFormat.parse(result.getString("/api/upload/imageinfo/@timestamp")); dateUploaded = isoFormat.parse(result.getString("/api/upload/imageinfo/@timestamp"));
} catch (java.text.ParseException e) { } catch(java.text.ParseException e) {
throw new RuntimeException(e); // Hopefully mediawiki doesn't give me bogus stuff? throw new RuntimeException(e); // Hopefully mediawiki doesn't give me bogus stuff?
} }