Implemented cancel previous request when changing camera.

Enable immersive mode only on devices with Kitkat or greater.
Changed minimum supported version to Gingerbread.
Changed messages and layout attributes for displaying status.
Uses the new api.

Author: emcorrales

app/build.gradle

@@ -6,10 +6,10 @@ android {
 
     defaultConfig {
         applicationId "com.pinoymobileapps.mrtcctv"
-        minSdkVersion 15
+        minSdkVersion 10
         targetSdkVersion 23
         versionCode 7
-        versionName "2.1.2"
+        versionName "2.2.0"
     }
     buildTypes {
         release {
@@ -24,5 +24,6 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.0.1'
     compile 'com.android.support:design:23.0.1'
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile group: 'commons-io', name: 'commons-io', version: '2.0.1'
+    compile 'com.squareup.retrofit:retrofit:2.0.0-beta1'
+    compile 'com.squareup.retrofit:converter-gson:2.0.0-beta1'
 }

app/src/main/java/com/pinoymobileapps/mrtcctv/ApiService.java

@@ -0,0 +1,13 @@
+package com.pinoymobileapps.mrtcctv;
+
+import com.squareup.okhttp.ResponseBody;
+
+import retrofit.Call;
+import retrofit.http.GET;
+import retrofit.http.Query;
+
+public interface ApiService {
+    @GET("/mrtcctv2/")
+    Call<ResponseBody> stream(@Query("stationId") int stationId, @Query("cameraId") int cameraId);
+}
+

app/src/main/java/com/pinoymobileapps/mrtcctv/CctvFragment.java

@@ -14,14 +14,17 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.io.BufferedInputStream;
+import com.squareup.okhttp.ResponseBody;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
+import java.net.SocketTimeoutException;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
+import retrofit.Call;
+import retrofit.Callback;
+import retrofit.Response;
+import retrofit.Retrofit;
 
 public class CctvFragment extends Fragment {
 
@@ -41,59 +44,17 @@ public class CctvFragment extends Fragment {
     private boolean mIsChangingOrientation = false;
     private Bitmap mImage;
 
-    private class StreamingTask extends AsyncTask<Void, Void, ResponseDetails> {
-        int cameraId;
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            cameraId = mCameraId;
-        }
-
-        @Override
-        protected ResponseDetails doInBackground(Void... params) {
-            try {
-                return stream(getActivity(), mStationId, mCameraId);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(ResponseDetails responseDetails) {
-            super.onPostExecute(responseDetails);
-            //If has internet connection.
-            if (responseDetails != null && responseDetails.isConnected()) {
-                //If request hasn't changed while waiting for a response.
-                if (responseDetails.getStationId() == mStationId
-                        && responseDetails.getCameraId() == mCameraId) {
-                    //if the request was successful and responded with an image.
-                    if (responseDetails.getResponseCode() == 200
-                            && responseDetails.getImage() != null) {
-                        showImage(responseDetails.getImage());
-                    } else if (responseDetails.getResponseCode() == 408) {//If connection timeout.
-                        clearImage();
-                        displayMessage(R.string.connection_timeout);
-                    } else {//If request failed.
-                        clearImage();
-                        displayMessage(R.string.no_cctv);
-                    }
-                } else { //If the request has changed while waiting, keep loading.
-                    showLoading();
-                }
-
-            } else { //If no internet connection.
-                displayMessage(R.string.no_connection);
-            }
-            new StreamingTask().execute();
-        }
-    }
+    private ApiService mApiService;
+    private Call<ResponseBody> mCaller;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setRetainInstance(true);
+
+        String baseUrl = getResources().getString(R.string.api_base_url);
+        Retrofit retrofit = new Retrofit.Builder().baseUrl(baseUrl).build();
+        mApiService = retrofit.create(ApiService.class);
     }
 
     @Override
@@ -116,7 +77,102 @@ public void onResume() {
         } else {
             showLoading();
         }
-        new StreamingTask().execute();
+        stream(mStationId, mCameraId);
+    }
+
+    private void stream(final int stationId, final int cameraId) {
+        if (isResumed()) {
+            //If has internet connection.
+            if (isConnected(getActivity())) {
+                mCaller = mApiService.stream(stationId, cameraId);
+                mCaller.enqueue(new Callback<ResponseBody>() {
+                    @Override
+                    public void onResponse(Response<ResponseBody> response) {
+                        //If request hasn't changed while waiting for a response.
+                        if (stationId == mStationId && cameraId == mCameraId) {
+                            //if the request was successful and responded with an image.
+                            if (response.code() == 200 && response.body() != null) {
+                                try {
+                                    mImage = BitmapFactory.decodeStream(response.body().byteStream());
+                                    if (mImage != null) {
+                                        showImage(mImage);
+                                    } else {//If didn't return an image.
+                                        clearImage();
+                                        displayMessage(R.string.cctv_not_available);
+                                    }
+
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+
+                            } else if (response.code() == 408) {//If connection timeout.
+                                clearImage();
+                                displayMessage(R.string.connection_timeout);
+                            } else {//If request failed.
+                                clearImage();
+                                displayMessage(R.string.cctv_not_available);
+                            }
+
+                        } else {//If the request has changed while waiting, keep loading.
+                            showLoading();
+                        }
+
+                        stream(mStationId, mCameraId);
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t) {
+                        if (t instanceof SocketTimeoutException) {
+                            clearImage();
+                            displayMessage(R.string.connection_timeout);
+                        } else {
+                            clearImage();
+                            displayMessage(R.string.cctv_not_available);
+                        }
+                        stream(mStationId, mCameraId);
+                    }
+                });
+
+            } else {//If no internet connection.
+                displayMessage(R.string.connection_not_available);
+                waitForAvailableNetwork();
+            }
+        }
+    }
+
+    private boolean isConnected(Context context) {
+        if (context != null) {
+            ConnectivityManager connMgr = (ConnectivityManager)
+                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+            if (connMgr != null) {
+                NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
+                if (networkInfo != null) {
+                    return networkInfo.isConnected();
+                }
+            }
+        }
+        return false;
+    }
+
+    private void waitForAvailableNetwork() {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                while (!isConnected(getActivity())) {
+                    if (mCaller != null) {
+                        mCaller.cancel();
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void aVoid) {
+                super.onPostExecute(aVoid);
+                stream(mStationId, mCameraId);
+            }
+        }.execute();
     }
 
     @Override
@@ -143,7 +199,7 @@ public void onDetach() {
 
     private void showImage(Bitmap image) {
         if (image == null) {
-            throw new IllegalArgumentException("image cannot be null");
+            throw new IllegalArgumentException("image cannot be null.");
         } else {
             mCctvStatus.setVisibility(View.INVISIBLE);
             mProgressBar.setVisibility(View.INVISIBLE);
@@ -154,9 +210,13 @@ private void showImage(Bitmap image) {
 
     public void setCamera(int stationId, int cameraId) {
         if (mStationId != stationId || mCameraId != cameraId) {
-            showLoading();
+            if (mCaller != null) {
+                mCaller.cancel();
+            }
             mStationId = stationId;
             mCameraId = cameraId;
+            showLoading();
+            stream(mStationId, mCameraId);
         }
     }
 
@@ -190,56 +250,4 @@ private void displayMessage(int stringResId) {
             mImageView.setImageBitmap(null);
         }
     }
-
-    private boolean isConnected(Context context) {
-        if (context != null) {
-            ConnectivityManager connMgr = (ConnectivityManager)
-                    context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-            if (connMgr != null) {
-                NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
-                if (networkInfo != null) {
-                    return networkInfo.isConnected();
-                }
-            }
-        }
-        return false;
-    }
-
-    private ResponseDetails stream(Context context, int stationId, int cameraId)
-            throws IOException {
-        ResponseDetails responseDetails = new ResponseDetails(stationId, cameraId);
-
-        if (isConnected(context)) {
-            responseDetails.setIsConnected(true);
-            InputStream is = null;
-
-            try {
-                URL url = new URL("http://api.pinoymobileapps.com/mrtcctv/?stationId="
-                        + stationId + "&cameraId=" + cameraId);
-                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                conn.connect();
-
-                responseDetails.setResponseCode(conn.getResponseCode());
-                if (responseDetails.getResponseCode() == 200) {
-                    is = conn.getInputStream();
-                    BufferedInputStream bufferedInputStream = new BufferedInputStream(is);
-                    Bitmap image = BitmapFactory.decodeStream(bufferedInputStream);
-                    responseDetails.setImage(image);
-                }
-
-            } finally {
-                if (is != null) {
-                    is.close();
-                }
-            }
-
-        } else {
-            responseDetails.setIsConnected(false);
-        }
-
-        return responseDetails;
-    }
-
-
 }

app/src/main/java/com/pinoymobileapps/mrtcctv/MainActivity.java

@@ -1,8 +1,11 @@
 package com.pinoymobileapps.mrtcctv;
 
+import android.content.Context;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -149,7 +152,9 @@ public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
         if (hasFocus
                 && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE
-                && mCctvFragment != null) {
+                && mCctvFragment != null
+                && mCctvFragment.getView() != null
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             mCctvFragment.getView().setSystemUiVisibility(
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                             | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -300,7 +305,7 @@ private void changeStation(final int stationId) {
     private void selectButton(Button button) {
         clearButtons();
         if (button != null) {
-            button.setTextColor(getResources().getColor(R.color.button_selected_text));
+            button.setTextColor(ContextCompat.getColor(this, R.color.button_selected_text));
         }
     }
 
@@ -313,7 +318,7 @@ private void clearButtons() {
 
     private void clearButton(Button button) {
         if (button != null) {
-            button.setTextColor(getResources().getColor(R.color.button_default_text));
+            button.setTextColor(ContextCompat.getColor(this, R.color.button_default_text));
         }
     }