Merging

matburt · Sep 10, 2010 · a69e171 · a69e171
1 parent 062de37
commit a69e171
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -42,6 +42,6 @@
     </activity>
     <activity android:name="SDCardSettingsActivity"
               android:label="SDCard Settings">
-    </activity>
+    </activity>    
   </application>
 </manifest>
diff --git a/src/com/matburt/mobileorg/SDCardSettingsActivity.java b/src/com/matburt/mobileorg/SDCardSettingsActivity.java
@@ -12,6 +12,6 @@ public class SDCardSettingsActivity extends PreferenceActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.webdav_preferences);
+        addPreferencesFromResource(R.xml.sdsync_preferences);
     }
 }
diff --git a/src/com/matburt/mobileorg/SettingsActivity.java b/src/com/matburt/mobileorg/SettingsActivity.java
@@ -23,10 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent prefsIntent = getIntent();
         int resourceID = prefsIntent.getIntExtra("prefs",R.xml.preferences);
         addPreferencesFromResource(resourceID);                
-        if(resourceID == R.xml.preferences)
-        {
-            populateSyncSources();
-        }
+        populateSyncSources();
     }
 
     protected void populateSyncSources()
@@ -62,14 +59,12 @@ protected void populateSyncSources()
         //fill in the Intents for built-in synchronizers
         Intent synchroIntent = new Intent();
         synchroIntent.setClassName("com.matburt.mobileorg",
-                                   "com.matburt.mobileorg.SettingsActivity");
-        synchroIntent.putExtra("prefs",R.xml.webdav_preferences);            
-        SynchronizerPreferences.syncIntents.put("webdav",synchroIntent);
+                                   "com.matburt.mobileorg.WebDAVSettingsActivity");
+         SynchronizerPreferences.syncIntents.put("webdav",synchroIntent);
 
         synchroIntent = new Intent();
         synchroIntent.setClassName("com.matburt.mobileorg",
-                                   "com.matburt.mobileorg.SettingsActivity");
-        synchroIntent.putExtra("prefs",R.xml.sdsync_preferences);     
+                                   "com.matburt.mobileorg.SDCardSettingsActivity");
         SynchronizerPreferences.syncIntents.put("sdcard", synchroIntent);
 
         //populate the sync source list with updated data