diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 40073ff..a7bf16a 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -118,7 +118,8 @@ - Start<------------"); ArrayList list = new ArrayList<>(); @@ -1350,9 +1342,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } catch (Exception ex) { Log.d("Exception ", " in Insert MSL_Availability " + ex.toString()); } - } - - + public void InsertMAPPING_ADDITIONAL_PROMOTION(MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter data) { db.delete("MAPPING_ADDITIONAL_PROMOTION", null, null); @@ -1615,7 +1605,4 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - - - } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 0718358..dd24000 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -194,7 +194,9 @@ public class MainActivity extends AppCompatActivity overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } else if (id == R.id.nav_setting) { - //startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); + + startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); + } else if (id == R.id.nav_export) { AlertDialog.Builder builder1 = new AlertDialog.Builder(MainActivity.this); 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 123d57c..5e9ca43 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -16,6 +16,7 @@ public class CommonString { public static final String KEY_DATE = "date"; public static final String KEY_STOREVISITED_STATUS = "STOREVISITED_STATUS"; + public static final String KEY_PATH = "path"; public static final String KEY_VERSION = "APP_VERSION"; 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 238a91b..c6a0484 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -603,6 +603,8 @@ public class DownloadActivity extends AppCompatActivity { db.insertNonWorkingData(nonWorkingReasonGetterSetter); + db.insertNonWorkingData(nonWorkingReasonGetterSetter); + } catch (MalformedURLException e) { /*final AlertMessage message = new AlertMessage( CompleteDownloadActivity.this, diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index a2bc4c1..3d29027 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -98,4 +98,6 @@ PromoCompliance Please Download Data First + Please Download Data First +