From 430750d9bf26f217412e26baf06195cd662a4835 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Tue, 15 Mar 2016 13:39:47 +0300
Subject: [PATCH] [new downloader][android] fix: Onmap downloader was not
 display size sometimes. fix: Allow to delete group nodes in downloader.

---
 .../mapswithme/maps/downloader/DownloaderAdapter.java    | 4 ++++
 .../com/mapswithme/maps/downloader/OnmapDownloader.java  | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
index ab2fe0121e..fa363501c2 100644
--- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
+++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java
@@ -311,6 +311,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         if (mItem.present)
           items.add(MenuItem.EXPLORE);
         break;
+
+      case CountryItem.STATUS_PARTLY:
+        items.add(MenuItem.DELETE);
+        break;
       }
 
       if (items.isEmpty())
diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
index 6657a149d5..f81ea7b9b4 100644
--- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
+++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
@@ -110,16 +110,15 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
 
         mTitle.setText(mCurrentCountry.name);
 
+        String size = StringUtils.getFileSizeString(mCurrentCountry.totalSize);
+
         if (progress)
-        {
-          mSize.setText(StringUtils.getFileSizeString(mCurrentCountry.totalSize));
           mProgress.setProgress((int) (mCurrentCountry.progress * 100L / mCurrentCountry.totalSize));
-        }
         else
         {
           if (enqueued)
           {
-            mSize.setText(R.string.downloader_queued);
+            size = mActivity.getString(R.string.downloader_queued);
             mProgress.setProgress(0);
           }
           else
@@ -152,6 +151,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
                                    : R.string.download);
           }
         }
+
+        mSize.setText(size);
       }
     }