diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 0a314c7..f40d81d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -149,7 +149,7 @@ public class MainActivity extends AppCompatActivity if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); } else { - super.onBackPressed(); + // super.onBackPressed(); } } 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 f6def44..0482289 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -680,9 +680,9 @@ public class UploadActivity extends AppCompatActivity { if (t2PGetterSetters.size() > 0) { for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) { - ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id()); - ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id()); - ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i).getKey_id()); + ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id()); + ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id()); + ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i1).getKey_id()); String gaps_xml = ""; String gaps_child;