Removed original update functionality.

res/layout/about.xml

@@ -43,7 +43,7 @@
 
 	<Button android:id="@+id/aboutBtnOk" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:text="OK"
-		android:layout_marginBottom="25px" />
+		android:layout_marginBottom="35px" />
 
 </LinearLayout>
 

res/xml/configuration.xml

@@ -52,8 +52,6 @@
 	<PreferenceCategory android:title="Misc">
 		<CheckBoxPreference android:key="configuration_misc_autostart"
 			android:title="Autostart" android:summary="Autostart Nagroid after reboot" />
-		<CheckBoxPreference android:key="configuration_misc_update"
-			android:title="Nagroid Updates" android:summary="Check for Nagroid updates" />
 		<TimePickerPreference android:key="configuration_misc_snoozetime"
 			android:title="Snooze time" android:summary="Snooze until this time in the morning"
 			android:defaultValue="9:00" />

src/de/schoar/nagroid/ConfigurationAccess.java

@@ -33,7 +33,6 @@ public class ConfigurationAccess {
 	public static final String POLLING_EXTSTATE = "configuration_polling_extstate";
 
 	public static final String MISC_AUTOSTART = "configuration_misc_autostart";
-	public static final String MISC_UPDATE = "configuration_misc_update";
 	public static final String MISC_SNOOZETIME = "configuration_misc_snoozetime";
 
 	private static final String INTERN_LAST_POLL_TIME = "intern_last_poll_time";
@@ -232,15 +231,6 @@ public synchronized void setMiscAutostart(boolean bool) {
 				.commit();
 	}
 
-	public synchronized boolean getMiscUpdate() {
-		return mSharedPreferencesPreference.getBoolean(MISC_UPDATE, true);
-	}
-
-	public synchronized void setMiscUpdate(boolean bool) {
-		mSharedPreferencesPreference.edit().putBoolean(MISC_UPDATE, bool)
-				.commit();
-	}
-
 	public synchronized long getInternLastPollTime() {
 		return mSharedPreferencesIntern.getLong(INTERN_LAST_POLL_TIME, 0);
 	}

src/de/schoar/nagroid/DM.java

@@ -10,7 +10,6 @@
 import de.schoar.nagroid.log.NagroidLog;
 import de.schoar.nagroid.nagios.NagiosState;
 import de.schoar.nagroid.notification.HealthNotificationHelper;
-import de.schoar.nagroid.notification.UpdateNotificationHelper;
 import de.schoar.nagroid.polling.PollHandler;
 import de.schoar.nagroid.service.PollReceiver;
 
@@ -45,7 +44,6 @@ public synchronized static void unregister(Context ctx) {
 	private ConfigurationAccess mConfigurationAccess;
 
 	private HealthNotificationHelper mHealthNotificationHelper;
-	private UpdateNotificationHelper mUpdateNotificationHelper;
 
 	private PollHandler mPollHandler;
 
@@ -59,7 +57,6 @@ private DM(Context ctx) {
 
 		mHealthNotificationHelper = new HealthNotificationHelper(ctx,
 				mConfigurationAccess);
-		mUpdateNotificationHelper = new UpdateNotificationHelper(ctx);
 
 		mPollHandler = new PollHandler(ctx);
 	}
@@ -96,10 +93,6 @@ public HealthNotificationHelper getHealthNotificationHelper() {
 		return mHealthNotificationHelper;
 	}
 
-	public UpdateNotificationHelper getUpdateNotificationHelper() {
-		return mUpdateNotificationHelper;
-	}
-
 	public NagroidLog getNagroidLog() {
 		return mNagroidLog;
 	}

src/de/schoar/nagroid/activity/ConfigurationActivity.java

@@ -395,22 +395,6 @@ public boolean onPreferenceChange(Preference pref,
 						return false;
 					}
 				});
-
-		final CheckBoxPreference cbpMiscUpdate = (CheckBoxPreference) findPreference(ConfigurationAccess.MISC_UPDATE);
-		boolean cbpMiscUpdateValue = DM.I.getConfiguration().getMiscUpdate();
-		cbpMiscUpdate.setChecked(cbpMiscUpdateValue);
-
-		cbpMiscUpdate
-				.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-					@Override
-					public boolean onPreferenceChange(Preference pref,
-							Object obj) {
-						Boolean bool = (Boolean) obj;
-						DM.I.getConfiguration().setMiscUpdate(bool);
-						cbpMiscUpdate.setChecked(bool);
-						return false;
-					}
-				});
 	}
 
 	private String alarmText(String uristr, String def) {

src/de/schoar/nagroid/polling/PollHandler.java

@@ -20,14 +20,12 @@ public class PollHandler {
 	private Boolean mPollRunning = false;
 
 	private NagiosPollHandler mNagiosPollHandler;
-	private UpdatePollHandler mUpdatePollHandler;
 
 	public PollHandler(Context ctx) {
 		mContext = ctx;
 		mConnectivityManager = (ConnectivityManager) mContext
 				.getSystemService(Context.CONNECTIVITY_SERVICE);
 		mNagiosPollHandler = new NagiosPollHandler(ctx);
-		mUpdatePollHandler = new UpdatePollHandler(ctx);
 	}
 
 	public void poll() {
@@ -80,7 +78,6 @@ private void runPoll() {
 		Log.d(LOGT, "Received poll request. Last poll was " + diff + "s ago");
 
 		mNagiosPollHandler.poll();
-		mUpdatePollHandler.poll();
 	}
 
 	private void postPoll() {