Lint more; in humla as well

10 files changed, 29 insertions, 22 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 7e68a1d..2782bf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// How to enable lints at compile time:
-// allprojects {
-//     tasks.withType(JavaCompile) {
-//         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
-//     }
-// }
+allprojects {
+    tasks.withType(JavaCompile) {
+        // TODO include deprecations at some point, but currently they are *many*
+        options.compilerArgs << "-Xlint:all" << "-Xlint:-deprecation" << "-Xlint:-dep-ann"
+    }
+}
 
 buildscript {
     repositories {
diff --git a/app/src/main/java/se/lublin/mumla/app/DrawerAdapter.java b/app/src/main/java/se/lublin/mumla/app/DrawerAdapter.java
index dfee7bc..ccae0d2 100644
--- a/app/src/main/java/se/lublin/mumla/app/DrawerAdapter.java
+++ b/app/src/main/java/se/lublin/mumla/app/DrawerAdapter.java
@@ -128,10 +128,12 @@ public class DrawerAdapter extends ArrayAdapter<DrawerAdapter.DrawerRow> {
 
             switch((int) getItemId(position)) {
                 case HEADER_CONNECTED_SERVER:
-                    if(mProvider.isConnected()) {
+                    if (mProvider.isConnected()) {
                         title.setText(mProvider.getConnectedServerName());
-                        break;
+                    } else {
+                        title.setText(header.title);
                     }
+                    break;
                 default:
                     title.setText(header.title);
                     break;
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 bdd401a..d377aae 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -333,7 +333,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
                 Server server = MumbleURLParser.parseURL(url);
 
                 // Open a dialog prompting the user to connect to the Mumble server.
-                DialogFragment fragment = (DialogFragment) ServerEditFragment.createServerEditDialog(
+                DialogFragment fragment = ServerEditFragment.createServerEditDialog(
                         MumlaActivity.this, server, ServerEditFragment.Action.CONNECT_ACTION, true);
                 fragment.show(getSupportFragmentManager(), "url_edit");
             } catch (MalformedURLException e) {
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java b/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
index cf9247b..5493597 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelChatFragment.java
@@ -347,7 +347,7 @@ public class ChannelChatFragment extends HumlaServiceFragment implements ChatTar
                             targetMessage = getContext().getString(R.string.chat_message_to, textMessage.getActorName(), currentChannel.getName());
                         }
                     } else if (textMessage.getTargetUsers() != null && !textMessage.getTargetUsers().isEmpty()) {
-                        User user = (User) textMessage.getTargetUsers().get(0);
+                        User user = textMessage.getTargetUsers().get(0);
                         if (user != null && user.getName() != null) {
                             targetMessage = getContext().getString(R.string.chat_message_to, textMessage.getActorName(), user.getName());
                         }
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelListAdapter.java b/app/src/main/java/se/lublin/mumla/channel/ChannelListAdapter.java
index 84123c9..6cf5e3b 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelListAdapter.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelListAdapter.java
@@ -56,7 +56,7 @@ import se.lublin.mumla.service.MumlaService;
 /**
  * Created by andrew on 31/07/13.
  */
-public class ChannelListAdapter extends RecyclerView.Adapter implements UserMenu.IUserLocalStateListener {
+public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements UserMenu.IUserLocalStateListener {
     // Set particular bits to make the integer-based model item ids unique.
     public static final long CHANNEL_ID_MASK = (0x1L << 32);
     public static final long USER_ID_MASK = (0x1L << 33);
@@ -409,13 +409,13 @@ public class ChannelListAdapter extends RecyclerView.Adapter implements UserMenu
             return; // Skip adding children of contracted/empty channels.
         }
 
-        for (IUser user : (List<IUser>) channel.getUsers()) {
+        for (IUser user : channel.getUsers()) {
             if (user == null) {
                 continue;
             }
             nodes.add(new Node(channelNode, depth, user));
         }
-        for (IChannel subc : (List<IChannel>) channel.getSubchannels()) {
+        for (IChannel subc : channel.getSubchannels()) {
             constructNodes(channelNode, subc, depth + 1, nodes);
         }
     }
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java b/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java
index f0ae559..9cda063 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelMenu.java
@@ -85,6 +85,7 @@ public class ChannelMenu implements PermissionsPopupMenu.IOnMenuPrepareListener,
     }
 
     @Override
+    @SuppressWarnings("fallthrough")
     public boolean onMenuItemClick(MenuItem item) {
         if (!mService.isConnected())
             return false;
@@ -96,11 +97,15 @@ public class ChannelMenu implements PermissionsPopupMenu.IOnMenuPrepareListener,
                 break;
             case R.id.context_channel_add:
                 adding = true;
+                // fallthrough!
             case R.id.context_channel_edit:
                 ChannelEditFragment addFragment = new ChannelEditFragment();
                 Bundle args = new Bundle();
-                if (adding) args.putInt("parent", mChannel.getId());
-                else args.putInt("channel", mChannel.getId());
+                if (adding) {
+                    args.putInt("parent", mChannel.getId());
+                } else {
+                    args.putInt("channel", mChannel.getId());
+                }
                 args.putBoolean("adding", adding);
                 addFragment.setArguments(args);
                 addFragment.show(mFragmentManager, "ChannelAdd");
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java b/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
index 3757be4..3b2d170 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelSearchProvider.java
@@ -162,13 +162,13 @@ public class ChannelSearchProvider extends ContentProvider {
         if (root == null) {
             return;
         }
-        for (IUser user : (List<IUser>) root.getUsers()) {
+        for (IUser user : root.getUsers()) {
             if (user != null && user.getName() != null
                     && user.getName().toLowerCase().contains(str.toLowerCase())) {
                 users.add(user);
             }
         }
-        for (IChannel subc : (List<IChannel>) root.getSubchannels()) {
+        for (IChannel subc : root.getSubchannels()) {
             if (subc != null)
                 userSearch(subc, str, users);
         }
@@ -199,7 +199,7 @@ public class ChannelSearchProvider extends ContentProvider {
             channels.add(root);
         }
 
-        for (IChannel subc : (List<IChannel>) root.getSubchannels()) {
+        for (IChannel subc : root.getSubchannels()) {
             if (subc != null)
                 channelSearch(subc, str, channels);
         }
diff --git a/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java b/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java
index a0a8999..19916ff 100644
--- a/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/servers/FavouriteServerListFragment.java
@@ -51,7 +51,7 @@ public class FavouriteServerListFragment extends Fragment implements OnItemClick
     private ServerConnectHandler mConnectHandler;
     private DatabaseProvider mDatabaseProvider;
     private GridView mServerGrid;
-    private ServerAdapter mServerAdapter;
+    private ServerAdapter<Server> mServerAdapter;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -160,7 +160,7 @@ public class FavouriteServerListFragment extends Fragment implements OnItemClick
 
     @Override
     public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-        mConnectHandler.connectToServer((Server) mServerAdapter.getItem(arg2));
+        mConnectHandler.connectToServer(mServerAdapter.getItem(arg2));
     }
 
     public static interface ServerConnectHandler {
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 3097d31..8052c70 100644
--- a/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
+++ b/app/src/main/java/se/lublin/mumla/servers/PublicServerListFragment.java
@@ -413,9 +413,9 @@ public class PublicServerListFragment extends Fragment implements OnItemClickLis
             // If there are less servers than the value of our range, deal with it.
             mResponsesToSend = Math.min(SEARCH_RANGE, servers.size());
 
-            Iterator iterator = servers.iterator();
+            Iterator<PublicServer> iterator = servers.iterator();
             while(iterator.hasNext() && mGoodResponses.size() < mResponsesToSend) {
-                PublicServer server = (PublicServer) iterator.next();
+                PublicServer server = iterator.next();
                 new MatchServerInfoTask().executeOnExecutor(mPingExecutor, server);
             }
             try {
diff --git a/libraries/humla b/libraries/humla
-Subproject d6103a3c40c38c805f949b9922fd1cf1be0ea64
+Subproject f21a38e1f671ebce5dec4567d191480ba18ed3c