Browse Source

Regression bugs from last commit :)

Alexander Brakowski 7 years ago
parent
commit
5bab416498

+ 0 - 2
res/values-de/strings_preferences.xml

@@ -15,8 +15,6 @@
     <string name="pref_vibration_summ">Aktiviere Vibration</string>
     <string name="pref_upload">Upload von Aufzeichnungen</string>
     <string name="pref_upload_server">Server-Adresse</string>
-    <string name="pref_sync_frequency">Upload-Häufigkeit</string>
-    <string name="pref_sync_frequency_summary">Intervall in Sekunden, in dem Aufzeichnungen zur Online-Datenbank hochgeladen werden</string>
     <string name="pref_connection_settings">Verbindungs Einstellungen</string>
     <string name="pref_max_connections">Max Verbindungen</string>
     <string name="pref_max_connections_default">5</string>

+ 0 - 2
res/values/strings_preferences.xml

@@ -15,8 +15,6 @@
 	<string name="pref_vibration_summ">Enable Vibration</string>
 	<string name="pref_upload">Online Database</string>
 	<string name="pref_upload_server">Server Address</string>
-	<string name="pref_sync_frequency">Sync Frequency</string>
-	<string name="pref_sync_frequency_summary">Interval in seconds at which records will be uploaded to the online database</string>
 	<string name="pref_connection_settings">Connection Settings</string>
 	<string name="pref_max_connections">Max Connections</string>	
 	<integer name="pref_max_connections_default">5</integer>

+ 0 - 2
src/de/tudarmstadt/informatik/hostage/sync/android/SyncUtils.java

@@ -132,8 +132,6 @@ public class SyncUtils {
         }
 
         if(setupComplete){
-            System.out.println("------------------___> " + preferences.getString(PREF_SYNC_FREQUENCY, ""));
-
             long syncFrequency = Long.valueOf(preferences.getString(PREF_SYNC_FREQUENCY, "" + SYNC_FREQUENCY_MINUTES)) * SYNC_FREQUENCY_UNIT;
             long internalFrequency = preferences.getLong(PREF_SYNC_INTERNAL_FREQUENCY, SYNC_FREQUENCY);
 

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/ui/activity/MainActivity.java

@@ -326,7 +326,7 @@ public class MainActivity extends Activity {
             mDrawerList.setItemChecked(mDisplayedFragmentIndex, true);
             mDrawerList.setSelection(mDisplayedFragmentIndex);
             setTitle(mDrawerItems.get(mDisplayedFragmentIndex).text);
-            getFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            getFragmentManager().popBackStack(HomeFragment.class.getName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
             getFragmentManager().putFragment(savedInstanceState, mRootFragment.getClass().getName(), mRootFragment);
 
             injectFragment(mDisplayedFragment);