Fix a potential sync bug if you refuse to enter any settings, bump ve…

…rsion number

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.matburt.mobileorg"
-      android:versionCode="46"
-      android:versionName="0.4.6">
+      android:versionCode="47"
+      android:versionName="0.4.7">
   <uses-sdk android:minSdkVersion="3"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

res/xml/preferences.xml

@@ -31,7 +31,7 @@
     <PreferenceScreen
         android:key="VersionDisp"
         android:title="Version"
-        android:summary="0.4.6">
+        android:summary="0.4.7">
     </PreferenceScreen>
   </PreferenceCategory>
 </PreferenceScreen>

src/com/matburt/mobileorg/MobileOrgActivity.java

@@ -416,6 +416,12 @@ else if (userSynchro.equals("sdcard")) {
             this.onShowSettings();
             return;
         }
+
+        if (!appSync.checkReady()) {
+            this.onShowSettings();
+            return;
+        }
+
         Thread syncThread = new Thread() {
                 public void run() {
                 	try {

src/com/matburt/mobileorg/SDCardSynchronizer.java

@@ -143,6 +143,12 @@ private void putFile(String path,
         }
     }
 
+    public boolean checkReady() {
+        if (this.appSettings.getString("indexFilePath", "").equals(""))
+            return false;
+        return true;
+    }
+
     public void pull() throws NotFoundException, ReportableError {
         String indexFile = this.appSettings.getString("indexFilePath","");
         Log.d(LT, "Index file at: " + indexFile);

src/com/matburt/mobileorg/Synchronizer.java

@@ -5,5 +5,6 @@ public interface Synchronizer
 {
     public void pull() throws NotFoundException, ReportableError;
     public void push() throws NotFoundException, ReportableError;
+    public boolean checkReady();
     public void close();
 }

src/com/matburt/mobileorg/WebDAVSynchronizer.java

@@ -135,6 +135,12 @@ else if (storageMode.equals("sdcard")) {
         }
     }
 
+    public boolean checkReady() {
+        if (this.appSettings.getString("webUrl","").equals(""))
+            return false;
+        return true;
+    }
+
     public void pull() throws NotFoundException, ReportableError {
         Pattern checkUrl = Pattern.compile("http.*\\.(?:org|txt)$");
         String url = this.appSettings.getString("webUrl", "");