From dd758a7964b0b3efb95dd8c0bdb9d90aebded71b Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Wed, 30 Jan 2013 02:41:02 +0530
Subject: [PATCH] Show count of uploads being queued up

---
 commons/res/layout/layout_upload_progress.xml | 25 +++++++++++++++--
 commons/res/values-v14/styles.xml             |  4 ++-
 commons/res/values/strings.xml                |  1 +
 commons/res/values/styles.xml                 |  2 ++
 .../org/wikimedia/commons/UploadService.java  | 28 ++++++++++++++++---
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/commons/res/layout/layout_upload_progress.xml b/commons/res/layout/layout_upload_progress.xml
index 239571b92..73510b593 100644
--- a/commons/res/layout/layout_upload_progress.xml
+++ b/commons/res/layout/layout_upload_progress.xml
@@ -29,15 +29,34 @@
             android:focusableInTouchMode="true"
             android:ellipsize="marquee"/>
 
-        <ProgressBar
-            android:id="@+id/uploadNotificationProgress"
+        <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+        <ProgressBar
+            android:id="@+id/uploadNotificationProgress"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
             android:indeterminate="false"
             android:indeterminateOnly="false"
-            android:progressDrawable="@android:drawable/progress_horizontal" >
+            android:layout_weight="1"
+            style="@style/NotificationProgress" >
 
         </ProgressBar>
+
+            <TextView
+                android:id="@+id/uploadNotificationsCount"
+                android:layout_height="fill_parent"
+                android:layout_width="wrap_content"
+                android:singleLine="true"
+                android:focusable="true"
+                android:text="1 left"
+                android:focusableInTouchMode="true"
+                style="@style/NotificationText"
+                android:layout_marginLeft="8dp"
+                />
+        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/commons/res/values-v14/styles.xml b/commons/res/values-v14/styles.xml
index 1c089a788..d34c32769 100644
--- a/commons/res/values-v14/styles.xml
+++ b/commons/res/values-v14/styles.xml
@@ -1,5 +1,7 @@
 <resources>
 
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
+    <style name="AppTheme" parent="android:Theme.Holo.Light" />
+
+    <style name="NotificationProgress" parent="android:Widget.Holo.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index 72661de3b..924c7cdc6 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -28,6 +28,7 @@
     <string name="upload_progress_notification_title_finishing">Finishing uploading %1$s</string>
     <string name="upload_failed_notification_title">Uploading %1$s failed</string>
     <string name="upload_failed_notification_subtitle">Tap to retry</string>
+    <string name="uploads_pending_notification_indicator">%d</string>
     
     <string name="transcoding_progress_title_start">Starting %1$s Transcoding</string>
     <string name="transcoding_progress_title_in_progress">Transcoding %1$s</string>
diff --git a/commons/res/values/styles.xml b/commons/res/values/styles.xml
index 70306cf6a..786419252 100644
--- a/commons/res/values/styles.xml
+++ b/commons/res/values/styles.xml
@@ -15,4 +15,6 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+    <style name="NotificationProgress" parent="Theme.Commons" />
+
 </resources>
\ No newline at end of file
diff --git a/commons/src/main/java/org/wikimedia/commons/UploadService.java b/commons/src/main/java/org/wikimedia/commons/UploadService.java
index fbcb627f8..109e503ed 100644
--- a/commons/src/main/java/org/wikimedia/commons/UploadService.java
+++ b/commons/src/main/java/org/wikimedia/commons/UploadService.java
@@ -32,6 +32,10 @@ public class UploadService extends IntentService {
    
     private NotificationManager notificationManager;
     private CommonsApplication app;
+
+    private Notification curProgressNotification;
+
+    private int toUpload;
     
     public UploadService(String name) {
         super(name);
@@ -68,6 +72,8 @@ public class UploadService extends IntentService {
             RemoteViews curView = curNotification.contentView;
             if(!notificationTitleChanged) {
                 curView.setTextViewText(R.id.uploadNotificationTitle, notificationProgressTitle);
+                curView.setTextViewText(R.id.uploadNotificationsCount, String.format(getString(R.string.uploads_pending_notification_indicator), toUpload));
+                Log.d("Commons", String.format("%d uploads left", toUpload));
                 notificationTitleChanged = true;
             }
             if(transferred == total) {
@@ -102,7 +108,18 @@ public class UploadService extends IntentService {
         cursor.moveToFirst();
         return cursor.getString(column_index);
     }
-    
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        toUpload++;
+        if(curProgressNotification != null) {
+            curProgressNotification.contentView.setTextViewText(R.id.uploadNotificationsCount, String.format(getString(R.string.uploads_pending_notification_indicator), toUpload));
+            Log.d("Commons", String.format("%d uploads left", toUpload));
+            notificationManager.notify(NOTIFICATION_DOWNLOAD_IN_PROGRESS, curProgressNotification);
+        }
+        return super.onStartCommand(intent, flags, startId);
+    }
+
     @Override
     protected void onHandleIntent(Intent intent) {
        MWApi api = app.getApi();
@@ -145,7 +162,7 @@ public class UploadService extends IntentService {
        notificationView.setProgressBar(R.id.uploadNotificationProgress, 100, 0, false);
        
        Log.d("Commons", "Before execution!");
-       Notification progressNotification = new NotificationCompat.Builder(this).setAutoCancel(true)
+       curProgressNotification = new NotificationCompat.Builder(this).setAutoCancel(true)
                .setSmallIcon(R.drawable.ic_launcher)
                .setAutoCancel(true)
                .setContent(notificationView)
@@ -154,10 +171,10 @@ public class UploadService extends IntentService {
                .setTicker(String.format(getString(R.string.upload_progress_notification_title_in_progress), filename))
                .getNotification();
      
-       this.startForeground(NOTIFICATION_DOWNLOAD_IN_PROGRESS, progressNotification);
+       this.startForeground(NOTIFICATION_DOWNLOAD_IN_PROGRESS, curProgressNotification);
        
        Log.d("Commons", "Just before");
-       NotificationUpdateProgressListener notificationUpdater = new NotificationUpdateProgressListener(progressNotification, notificationTag, 
+       NotificationUpdateProgressListener notificationUpdater = new NotificationUpdateProgressListener(curProgressNotification, notificationTag,
                                                                     String.format(getString(R.string.upload_progress_notification_title_in_progress), filename), 
                                                                     String.format(getString(R.string.upload_progress_notification_title_finishing), filename)
                                                                 );
@@ -190,10 +207,13 @@ public class UploadService extends IntentService {
                    .getNotification();
            notificationManager.notify(NOTIFICATION_UPLOAD_FAILED, failureNotification);
            return;
+       } finally {
+           toUpload--;
        }
       
        Log.d("Commons", "Response is"  + CommonsApplication.getStringFromDOM(result.getDocument()));
        stopForeground(true);
+       curProgressNotification = null;
        
        String descUrl = result.getString("/api/upload/imageinfo/@descriptionurl");