From 084cfd7b70637dca5541a3da3a77055f2976ab6e Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Tue, 10 Jan 2017 17:43:29 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 GG_Update_Manifest

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
---
 .../cpm/com/gskmtorange/constant/CommonString.java    |  4 ++++
 .../cpm/com/gskmtorange/upload/UploadActivity.java    | 11 +++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
index 59338c8..383197b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -102,6 +102,10 @@ public class CommonString {
     public static final String SOAP_ACTION_UPLOAD_STORE_COVERAGE = "http://tempuri.org/"
             + METHOD_UPLOAD_COVERAGE;
 
+    public static final String METHOD_UPLOAD_IMAGE = "GetImageWithFolderName";
+
+    public static final String SOAP_ACTION_UPLOAD_IMAGE = "http://tempuri.org/" + METHOD_UPLOAD_IMAGE;
+
     //Alert Messages
 
 
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index 7d4da89..6c789a6 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -440,7 +440,7 @@ public class UploadActivity extends AppCompatActivity {
                         //Image Upload
 
                         //Stock Facing Images Upload
-                        /*if (stock_facingHeaderList.size() > 0) {
+                        if (stock_facingHeaderList.size() > 0) {
                             for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
 
                                 if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) {
@@ -484,7 +484,7 @@ public class UploadActivity extends AppCompatActivity {
                                     }
                                 }
                             }
-                        }*/
+                        }
 
 
                         // SET COVERAGE STATUS
@@ -586,7 +586,7 @@ public class UploadActivity extends AppCompatActivity {
         byte[] ba = bao.toByteArray();
         String ba1 = Base64.encodeBytes(ba);
 
-        SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+        SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
 
         String[] split = path.split("/");
         String path1 = split[split.length - 1];
@@ -600,8 +600,7 @@ public class UploadActivity extends AppCompatActivity {
         envelope.setOutputSoapObject(request);
 
         HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
-        androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-        //androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
+        androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
 
         Object result = (Object) envelope.getResponse();
 
@@ -629,7 +628,7 @@ public class UploadActivity extends AppCompatActivity {
                 return CommonString.KEY_FAILURE;
             }
         } else {
-            new File(Path + path).delete();
+            //new File(Path + path).delete();
         }
 
         return result.toString();