Merge branch 'master' into StoreLISTAC

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -84,8 +84,6 @@ public class MainActivity extends AppCompatActivity
         db = new GSKOrangeDB(MainActivity.this);
         db.open();
 
-        coverageList = db.getCoverageData(date);
-
         webView.setWebViewClient(new MyWebViewClient());
 
         webView.getSettings().setJavaScriptEnabled(true);
@@ -128,6 +126,10 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onResume() {
         super.onResume();
+
+        db.open();
+        coverageList = db.getCoverageData(date);
+
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar.setTitle(getString(R.string.main_menu_activity_name));

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -218,6 +218,17 @@
 
     //text for uploading screen
 
+
+    <string name="coverage_data_uploading">Kapsam yükleniyor</string>
+    <string name="availability_data_uploading">Bulunurluk verisi paylaşılıyor</string>
+    <string name="stock_data_uploading">Stok verisi paylaşılıyor</string>
+    <string name="t2p_data_uploading">Kalıcı teşhir verisi paylaşılıyor</string>
+    <string name="additional_data_uploading">Ek teşhir verisi paylaşılıyor</string>
+    <string name="promo_data_uploading">Promosyon verisi paylaşılıyor</string>
+    <string name="no_data_for_upload">Yükleme İçin Veri Yok</string>
+    <string name="title_activity_checkout">Çıkış yapmak</string>
+
+
     <string name="coverage_data_uploading">Kapsam yükleniyor</string>
     <string name="availability_data_uploading">Bulunurluk verisi paylaşılıyor</string>
     <string name="stock_data_uploading">Stok verisi paylaşılıyor</string>

GSKMTOrange/src/main/res/values/strings.xml

@@ -259,8 +259,10 @@
     <string name="t2p_data_uploading">T2P Data Uploading</string>
     <string name="additional_data_uploading">Additional Visibility Data Uploading</string>
     <string name="promo_data_uploading">Promo Data Uploading</string>
+
     <string name="Areyou_sure_take_backup"> Are you sure you want to take the backup of your data</string>
 
     <string name="first_geotag_the_store">First geotag the store</string>
 
+
 </resources>