From 16bdac6be1f57c8e8f5118732b9458c41d7f6394 Mon Sep 17 00:00:00 2001
From: yadavendras <yadavendra@gmail.com>
Date: Wed, 25 Jan 2017 10:47:58 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 ysy_turk

# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
---
 .idea/modules.xml                                           | 2 --
 GSKMTOrange/src/main/AndroidManifest.xml                    | 1 +
 .../src/main/java/cpm/com/gskmtorange/MainActivity.java     | 6 ++++--
 .../com/gskmtorange/upload/PreviousDataUploadActivity.java  | 3 +--
 .../java/cpm/com/gskmtorange/upload/UploadActivity.java     | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index a329b11..ad566b9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
-      <module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
-      <module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
       <module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
     </modules>
   </component>
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index d63a2dd..9a6bced 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -150,6 +150,7 @@
             android:name=".upload.UploadActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_upload"
+            android:theme="@style/AppTheme.NoActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".dailyentry.SettingsActivity"
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 066167d..142c03f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -84,8 +84,6 @@ public class MainActivity extends AppCompatActivity
         db = new GSKOrangeDB(MainActivity.this);
         db.open();
 
-        coverageList = db.getCoverageData(date);
-
         webView.setWebViewClient(new MyWebViewClient());
 
         webView.getSettings().setJavaScriptEnabled(true);
@@ -128,6 +126,10 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onResume() {
         super.onResume();
+
+        db.open();
+        coverageList = db.getCoverageData(date);
+
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar.setTitle(getString(R.string.main_menu_activity_name));
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
index 7b5ec8d..d41b982 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -247,8 +247,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                                     + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
                                     + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
                                     + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
-                                    //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
-                                    + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+                                    + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
                                     + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
                                     + "[USER_ID]" + userId + "[/USER_ID]"
                                     + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
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 270f5bf..fdd6098 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -254,8 +254,7 @@ public class UploadActivity extends AppCompatActivity {
                                     + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
                                     + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
                                     + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
-                                    //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
-                                    + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+                                    + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
                                     + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
                                     + "[USER_ID]" + userId + "[/USER_ID]"
                                     + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"