db upload fix

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ba87eca..9e15f71 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"

-      package="pl.org.nowoczesnapolska.wlmobi" android:versionName="1.1" android:versionCode="3">
+      package="pl.org.nowoczesnapolska.wlmobi" android:versionName="1.1.1" android:versionCode="4">

     <supports-screens
        android:largeScreens="true"
        android:normalScreens="true"
     <supports-screens
        android:largeScreens="true"
        android:normalScreens="true"

diff --git a/assets/www/js/catalogue.js b/assets/www/js/catalogue.js
index 615f30f..44f8e80 100644 (file)
--- a/assets/www/js/catalogue.js
+++ b/assets/www/js/catalogue.js
@@ -99,20 +99,12 @@ var Catalogue = new function() {
 
                // db initialize
                // this is Android-specific for now
 
                // db initialize
                // this is Android-specific for now

-               var android = device.version.split('.')[0];
-               if (android > 1) {
-                       self.upload_db_android(done, error);
-               } else {
-                       error && error("Nieobsługiwana wersja systemu. Wymagany Android>=2.0.");
-               };
+               self.upload_db_android(done, error);

        };
 
 
        this.upload_db_android = function(success, error) {
        };
 
 
        this.upload_db_android = function(success, error) {

-               // TODO: this should be downloaded from teh net, not stored in res
-

                console.log('upload db for Android 2.x+');
                console.log('upload db for Android 2.x+');

-               // upload databases description file

 
                var dbname = "wolnelektury";
                var db = window.openDatabase(dbname, "1.0", "WL Catalogue", 500000);
 
                var dbname = "wolnelektury";
                var db = window.openDatabase(dbname, "1.0", "WL Catalogue", 500000);