From 2c077f5c3d16ce2be40ef80f05011eb41577daaf Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Thu, 29 Dec 2016 12:35:46 +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/Database/GSKOrangeDB.java | 59 ++++---------------
 .../gskmtorange/GeoTag/GeoTagActivity.java    |  7 ++-
 2 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index 4eb7e9c..4d2115d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -13,23 +13,18 @@ import cpm.com.gskmtorange.xmlHandlers.TableBean;
  * Created by ashishc on 29-12-2016.
  */
 
-public class GSKOrangeDB extends SQLiteOpenHelper{
-
-
-        public static final String DATABASE_NAME = "GSK_ORANGE";
-        public static final int DATABASE_VERSION = 13;
-        private SQLiteDatabase db;
-        TableBean tableBean;
-
+public class GSKOrangeDB extends SQLiteOpenHelper {
+    public static final String DATABASE_NAME = "GSK_ORANGE";
+    public static final int DATABASE_VERSION = 13;
+    private SQLiteDatabase db;
+    TableBean tableBean;
 
     public GSKOrangeDB(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
-
     }
 
     public void open() {
         try {
-
             db = this.getWritableDatabase();
         } catch (Exception e) {
             e.printStackTrace();
@@ -38,39 +33,26 @@ public class GSKOrangeDB extends SQLiteOpenHelper{
 
     @Override
     public void onCreate(SQLiteDatabase db) {
-
         db.execSQL(TableBean.getJourneyPlan());
-
-
-
-
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
         db.execSQL("DROP TABLE IF EXISTS " + TableBean.getJourneyPlan());
+    }
+
+    public void deleteTableWithStoreID(String storeid, String process_id) {
 
     }
 
-    public void deleteTableWithStoreID(String storeid, String process_id){
+    public void deleteAllTables() {
 
     }
 
-    public void deleteAllTables(){
-
-    }
-
-
-
-
-
     public void InsertJCP(JourneyPlanGetterSetter data) {
-
         db.delete("JOURNEY_PLAN", null, null);
 
         ContentValues values = new ContentValues();
-
         try {
 
             for (int i = 0; i < data.getSTORE_ID().size(); i++) {
@@ -110,30 +92,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper{
 
             }
 
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
             Log.d("Exception in JCP", ex.toString());
         }
     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
index 1e671a7..b3c647d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -21,7 +21,8 @@ import cpm.com.gskmtorange.R;
  * Created by ashishc on 27-12-2016.
  */
 
-public class GeoTagActivity   extends AppCompatActivity  implements OnMapReadyCallback,GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener{
+public class GeoTagActivity   extends AppCompatActivity {
+        //implements OnMapReadyCallback,GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener{
 
     private GoogleMap mMap;
     double latitude =0.0;
@@ -40,7 +41,7 @@ public class GeoTagActivity   extends AppCompatActivity  implements OnMapReadyCa
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        username = preferences.getString(CommonString.KEY_USERNAME, null);
+        //username = preferences.getString(CommonString.KEY_USERNAME, null);
 
 
         fab = (FloatingActionButton) findViewById(R.id.fab);
@@ -51,7 +52,7 @@ public class GeoTagActivity   extends AppCompatActivity  implements OnMapReadyCa
 
         mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
-        mapFragment.getMapAsync(this);
+        //mapFragment.getMapAsync(this);