Correct some sdk_int lint warnings

15 files changed, 5 insertions, 29 deletions

diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index 2f97249..2a7f025 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -757,13 +757,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if(Settings.PREF_THEME.equals(key)) {
             // Recreate activity when theme is changed
-            if(Build.VERSION.SDK_INT >= 11)
-                recreate();
-            else {
-                Intent intent = new Intent(this, MumlaActivity.class);
-                finish();
-                startActivity(intent);
-            }
+            recreate();
         } else if (Settings.PREF_STAY_AWAKE.equals(key)) {
             setStayAwake(mSettings.shouldStayAwake());
         } else if (Settings.PREF_HANDSET_MODE.equals(key)) {
diff --git a/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java b/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java
index 0e520d0..7b791b3 100644
--- a/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java
+++ b/app/src/main/java/se/lublin/mumla/preference/KeySelectDialogPreference.java
@@ -117,11 +117,7 @@ public class KeySelectDialogPreference extends DialogPreference implements OnKey
 		if(keyCode == 0) {
 			valueTextView.setText("No Key");
 		} else {
-			if(android.os.Build.VERSION.SDK_INT >= 12) {
-				valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
-			} else {
-				valueTextView.setText("Key code: "+keyCode);
-			}
+			valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
 		}
 	}
 
@@ -130,12 +126,7 @@ public class KeySelectDialogPreference extends DialogPreference implements OnKey
 	public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
 		if(keyCode != KeyEvent.KEYCODE_BACK) {
 			this.keyCode = keyCode;
-			
-			if(android.os.Build.VERSION.SDK_INT >= 12) {
-				valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
-			} else {
-				valueTextView.setText("Key code: "+keyCode);
-			}
+			valueTextView.setText(KeyEvent.keyCodeToString(keyCode));
 		} else {
 			dialog.dismiss();
 		}
diff --git a/app/src/main/java/se/lublin/mumla/preference/Preferences.java b/app/src/main/java/se/lublin/mumla/preference/Preferences.java
index 7c01f87..9456ac3 100644
--- a/app/src/main/java/se/lublin/mumla/preference/Preferences.java
+++ b/app/src/main/java/se/lublin/mumla/preference/Preferences.java
@@ -58,7 +58,6 @@ public class Preferences extends PreferenceActivity {
         super.onCreate(savedInstanceState);
 
         // Legacy preference section handling
-
         String action = getIntent().getAction();
         if (action != null) {
             if (ACTION_PREFS_GENERAL.equals(action)) {
@@ -75,8 +74,6 @@ public class Preferences extends PreferenceActivity {
                 addPreferencesFromResource(R.xml.settings_about);
                 configureAboutPreferences(this, getPreferenceScreen());
             }
-        } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-            addPreferencesFromResource(R.xml.preference_headers_legacy);
         }
     }
 
diff --git a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
index b753a91..b402668 100644
--- a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
@@ -122,7 +122,7 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        menu.findItem(R.id.menu_match_server).setVisible(VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB); // Executors only supported on Honeycomb +
+        menu.findItem(R.id.menu_match_server).setVisible(true);
     }
 
     @Override
diff --git a/app/src/main/java/se/lublin/mumla/servers/ServerAdapter.java b/app/src/main/java/se/lublin/mumla/servers/ServerAdapter.java
index 1f485d8..7fb47a2 100644
--- a/app/src/main/java/se/lublin/mumla/servers/ServerAdapter.java
+++ b/app/src/main/java/se/lublin/mumla/servers/ServerAdapter.java
@@ -122,13 +122,7 @@ public abstract class ServerAdapter<E extends Server> extends ArrayAdapter<E> {
                     notifyDataSetChanged();
                 }
             };
-
-            // Execute on parallel threads if API >= 11.
-            if(Build.VERSION.SDK_INT >= 11) {
-                task.executeOnExecutor(mPingExecutor, server);
-            } else {
-                task.execute(server);
-            }
+            task.executeOnExecutor(mPingExecutor, server);
         }
 
         return view;
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png
deleted file mode 100644
index 275068a..0000000
--- a/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png
deleted file mode 100644
index 6f674a3..0000000
--- a/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png
deleted file mode 100644
index e8610e8..0000000
--- a/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png
deleted file mode 100644
index 8cdef38..0000000
--- a/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png
deleted file mode 100644
index 69e2685..0000000
--- a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png
deleted file mode 100644
index a8c7249..0000000
--- a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png
deleted file mode 100644
index 72f9fb0..0000000
--- a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png
deleted file mode 100644
index 3836700..0000000
--- a/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png
+++ /dev/null
diff --git a/app/src/main/res/layout-sw600dp-v11/fragment_channel.xml b/app/src/main/res/layout-sw600dp/fragment_channel.xml
index e6a1f9e..e6a1f9e 100644
--- a/app/src/main/res/layout-sw600dp-v11/fragment_channel.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_channel.xml
diff --git a/app/src/main/res/layout-sw720dp-v11/fragment_channel.xml b/app/src/main/res/layout-sw720dp/fragment_channel.xml
index 8d455be..8d455be 100644
--- a/app/src/main/res/layout-sw720dp-v11/fragment_channel.xml
+++ b/app/src/main/res/layout-sw720dp/fragment_channel.xml