From 64612e448aef154612abef194952287045af2811 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 30 Dec 2016 11:28:45 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 Category_G

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
---
 .../com/gskmtorange/download/DownloadActivity.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index 44eba49..13ea84e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -71,7 +71,7 @@ public class DownloadActivity extends AppCompatActivity {
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         userId = preferences.getString(CommonString.KEY_USERNAME, null);
-        culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, null);
+        culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
         new UploadTask(DownloadActivity.this).execute();
     }
 
@@ -256,7 +256,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "SUB_CATEGORY_MASTER";
                     }
-                    data.value = 20;
+                    data.value = 40;
                     data.name = "SUB_CATEGORY_MASTER Data Download";
                 }
                 publishProgress(data);
@@ -291,7 +291,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "CATEGORY_MASTER";
                     }
-                    data.value = 20;
+                    data.value = 50;
                     data.name = "CATEGORY_MASTER Data Download";
                 }
                 publishProgress(data);
@@ -326,7 +326,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "DISPLAY_MASTER";
                     }
-                    data.value = 20;
+                    data.value = 60;
                     data.name = "DISPLAY_MASTER Data Download";
                 }
                 publishProgress(data);
@@ -361,7 +361,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "MAPPING_STOCK";
                     }
-                    data.value = 20;
+                    data.value = 80;
                     data.name = "MAPPING_STOCK Data Download";
                 }
                 publishProgress(data);
@@ -396,7 +396,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "MAPPING_T2P";
                     }
-                    data.value = 20;
+                    data.value = 100;
                     data.name = "MAPPING_T2P Data Download";
                 }
                 publishProgress(data);