diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index e5545dc..3c2e77b 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 6475325..49822f1 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -31,8 +31,8 @@ android { versionName "4.1"*/ //For Turkey - /* versionCode 26 - versionName "3.8"*/ + versionCode 27 + versionName "3.9" //For KSA /* versionCode 28 @@ -43,15 +43,14 @@ android { //sa - /* versionCode 27 - versionName "3.8"*/ - /*versionCode 28 + + /* versionCode 28 versionName "3.9"*/ //Kenya - versionCode 2 - versionName "1.1" + /* versionCode 2 + versionName "1.1"*/ //nigeria /* versionCode 1 versionName "1.0"*/ 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 c5273c2..51c2395 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/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; 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 e904a8d..10c7b12 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/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(); } 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 6d49c93..8a0a687 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/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(); diff --git a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java deleted file mode 100644 index 1e73f16..0000000 --- a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.androidbuts.multispinnerfilter; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter"; - public static final String BUILD_TYPE = "debug"; -}