uploadissue_resolve

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -96,7 +96,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB618";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB619";
     public static final int DATABASE_VERSION = 16;
     TableBean tableBean;
     private SQLiteDatabase db;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java

@@ -114,22 +114,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_upload);
-
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
-
-        CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
-
         date = preferences.getString(CommonString.KEY_DATE, null);
         userId = preferences.getString(CommonString.KEY_USERNAME, null);
         app_version = preferences.getString(CommonString.KEY_VERSION, null);
-
         db = new GSKOrangeDB(this);
         db.open();
         context = this;
         Path = CommonString.FILE_PATH;
-
+        CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
         //start upload
         new UploadTask(this).execute();
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java

@@ -1853,8 +1853,6 @@ public class UploadActivity extends AppCompatActivity {
 
             dialog.dismiss();
             if (result.contains(CommonString.KEY_SUCCESS)) {
-                //db.deleteAllTables();
-
                 File f = new File(CommonString.FILE_PATH);
                 //if (f != null && f.listFiles().length > 0) {
                 File file[] = f.listFiles();