Merge "Adding Compatibility for Android Jelly Bean and above (SDK 16) Warning, I've only been able to test with the emulator for Jelly Bean, so cannot guarentee that it's bug free on real hardware. Signed-off-by: James Sutton <james.sutton@uk.ibm.com>" into develop

Author: Ian Craggs

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/build.gradle

@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId "org.eclipse.paho.android.sample"
-        minSdkVersion 22
+        minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
         versionName "0.1"

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HelpFragment.java

@@ -93,7 +93,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                         .getConnections();
                 if(!connections.isEmpty()){
                     Map.Entry<String, Connection> entry = connections.entrySet().iterator().next();
-                    Connection connection = (Connection) entry.getValue();
+                    Connection connection = entry.getValue();
                     connection.getClient().setTraceEnabled(isChecked);
                     if(isChecked){
                         connection.getClient().setTraceCallback(new MqttTraceCallback());

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/MainActivity.java

@@ -138,7 +138,7 @@ private void displayDeleteView(int position){
             fragment.setArguments(bundle);
             Map<String, Connection> connections = Connections.getInstance(this)
                     .getConnections();
-            Connection connection = (Connection) connections.get(connectionMap.get(position));
+            Connection connection = connections.get(connectionMap.get(position));
             String title = connection.getId();
             displayFragment(fragment, "");
         }
@@ -155,7 +155,7 @@ private void displayView(int position){
             fragment.setArguments(bundle);
             Map<String, Connection> connections = Connections.getInstance(this)
                     .getConnections();
-            Connection connection = (Connection) connections.get(connectionMap.get(position));
+            Connection connection = connections.get(connectionMap.get(position));
             String title = connection.getId();
             displayFragment(fragment, title);
         }

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/SubscriptionFragment.java

@@ -5,7 +5,9 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -108,7 +110,7 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
 
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this.getActivity());
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(((AppCompatActivity) getActivity()).getSupportActionBar().getThemedContext());
         alertDialogBuilder.setView(promptView);
         alertDialogBuilder.setCancelable(true).setPositiveButton("OK", new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/adapter/NavigationDrawerAdapter.java

@@ -6,6 +6,7 @@
 import android.graphics.ColorFilter;
 import android.graphics.drawable.Drawable;
 import android.media.Image;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,8 +36,8 @@ public void delete(int position) {
     }
 
     private void setConnected(ImageView image){
-        Drawable doneCloud = context.getDrawable(R.drawable.ic_cloud_done_dark);
-        Drawable offCloud = context.getDrawable(R.drawable.ic_cloud_off_dark);
+        Drawable doneCloud = ContextCompat.getDrawable(context, R.drawable.ic_cloud_done_dark);
+        Drawable offCloud = ContextCompat.getDrawable(context, R.drawable.ic_cloud_off_dark);
         image.setImageDrawable(doneCloud);
     }
 
@@ -51,8 +52,8 @@ public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     public void onBindViewHolder(MyViewHolder holder, int position) {
         NavDrawerItem current = data.get(position);
         holder.title.setText(current.getTitle());
-        Drawable doneCloud = context.getDrawable(R.drawable.ic_cloud_done_dark);
-        Drawable offCloud = context.getDrawable(R.drawable.ic_cloud_off_dark);
+        Drawable doneCloud = ContextCompat.getDrawable(context, R.drawable.ic_cloud_done_dark);
+        Drawable offCloud = ContextCompat.getDrawable(context, R.drawable.ic_cloud_off_dark);
         holder.icon.setImageDrawable(doneCloud);
     }
 

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/layout/activity_add_connection.xml

@@ -1,7 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:paho="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/layout/fragment_edit_connection.xml

@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:paho="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/layout/fragment_manage.xml

@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:paho="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     tools:context="org.eclipse.paho.android.sample.activity.MessagesFragment">
 

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/layout/fragment_publish.xml

@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:paho="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     tools:context="org.eclipse.paho.android.sample.activity.MessagesFragment"
     android:layout_marginTop="56dp">

org.eclipse.paho.android.service/org.eclipse.paho.android.sample/src/main/res/menu/menu_main.xml

@@ -1,9 +1,4 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<menu xmlns:tools="http://schemas.android.com/tools"
     tools:context=".MainActivity">
-
-
-
 </menu>