Further code cleanup

Author: thht

app/build.gradle

@@ -20,7 +20,7 @@ android {
     }
 }
 
-if (new File(projectDir.toString() + java.io.File.separator + "signing.gradle").exists()) {
+if (new File(projectDir.toString() + File.separator + "signing.gradle").exists()) {
     apply from: 'signing.gradle';
 }
 

app/src/main/java/de/th_ht/ambilike/Hue.java

@@ -297,9 +297,8 @@ public void setColor(int[] rgb, int brightness)
 
   public List<PHLight> getLights()
   {
-    List<PHLight> list = cache.getAllLights();
 
-    return list;
+    return cache.getAllLights();
   }
 
   public void setLights(List<Integer> _lights)

app/src/main/java/de/th_ht/ambilike/HueReceiver.java

@@ -25,19 +25,12 @@
 
 public class HueReceiver extends BroadcastReceiver
 {
-  private static int rCounter = 0;
-
-  public HueReceiver()
-  {
-    super();
-  }
-
   @Override
   public void onReceive(Context context, Intent intent)
   {
     Hue hue = MainActivity.getHue();
 
-    Bundle bundle = (Bundle) intent.getBundleExtra("Stuff");
+    Bundle bundle = intent.getBundleExtra("Stuff");
     int[] rgb = bundle.getIntArray("rgb");
     int bri = bundle.getInt("bri", 128);
 

app/src/main/java/de/th_ht/ambilike/HueService.java

@@ -41,10 +41,6 @@ public class HueService extends Service
   private NotificationManager mNM;
   private int NOTIFICATION = 0;
 
-  public HueService()
-  {
-  }
-
   @Override
   public void onCreate()
   {
@@ -95,7 +91,7 @@ private void showNotification()
     // Set the icon, scrolling text and timestamp
     Notification notification = new Notification.Builder(getApplicationContext())
         .setContentTitle("HueService")
-        .setContentText("HueService started")
+        .setContentText(text)
         .setContentIntent(contentIntent)
         .setOngoing(true)
         .setSmallIcon(R.drawable.app_icon)
@@ -114,14 +110,11 @@ private class HueThread implements Runnable
     public void run()
     {
       killed = false;
-      boolean first = true;
       boolean good = true;
       while (!killed)
       {
-        if (first)
-        {
-          good = screenshot.snap();
-        }
+        good = screenshot.snap();
+
         if (good)
         {
           int clr = screenshot.getDominantColor();
@@ -147,9 +140,5 @@ public void kill()
 
   public class LocalBinder extends Binder
   {
-    HueService getService()
-    {
-      return HueService.this;
-    }
   }
 }

app/src/main/java/de/th_ht/ambilike/MainActivity.java

@@ -56,21 +56,11 @@ public class MainActivity extends ActionBarActivity
   private NumberPicker numberMaxBri;
   private HueReceiver huereceiver;
 
-  static public String getMyFilesDir()
-  {
-    return myFilesDir;
-  }
-
   public static Hue getHue()
   {
     return hue;
   }
 
-  public static DisplayMetrics getMetric()
-  {
-    return metric;
-  }
-
   @Override
   protected void onCreate(Bundle savedInstanceState)
   {
@@ -183,17 +173,11 @@ public void onClick(View view)
         for (PHLight cur_light : lights)
         {
           lights_strings[i] = cur_light.getName();
-          if (chosenLights.contains(i))
-          {
-            lights_checked[i] = true;
-          } else
-          {
-            lights_checked[i] = false;
-          }
+          lights_checked[i] = chosenLights.contains(i);
           i++;
         }
 
-        AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
+        new AlertDialog.Builder(MainActivity.this)
             .setTitle("Please choose lights")
             .setMultiChoiceItems(lights_strings, lights_checked, new DialogInterface.OnMultiChoiceClickListener()
             {
@@ -208,7 +192,7 @@ public void onClick(DialogInterface dialogInterface, int i, boolean b)
               @Override
               public void onClick(DialogInterface dialogInterface, int i)
               {
-                List<Integer> lights_chosen = new ArrayList<Integer>();
+                List<Integer> lights_chosen = new ArrayList<>();
                 for (int j = 0; j < lights_checked.length; j++)
                 {
                   if (lights_checked[j])
@@ -319,7 +303,7 @@ public boolean onOptionsItemSelected(MenuItem item)
   private List<Integer> getLightsFromPreference()
   {
     SharedPreferences prefs = getSharedPreferences(getPackageName() + "_preferences", MODE_PRIVATE);
-    List<Integer> lights = new ArrayList<Integer>();
+    List<Integer> lights = new ArrayList<>();
     int nLights = prefs.getInt("NLights", 0);
     for (int i = 0; i < nLights; i++)
     {

app/src/main/java/de/th_ht/ambilike/Screenshot.java

@@ -25,8 +25,6 @@
 import android.support.v7.graphics.Palette;
 import android.widget.ImageView;
 
-import org.apache.http.util.ByteArrayBuffer;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,10 +37,9 @@
 
 public class Screenshot implements Serializable
 {
-  protected Bitmap shot, oldshot;
+  protected Bitmap shot;
   private String myFilesDir;
   private String cmdline;
-  private ByteArrayBuffer buf;
   private int displaywidth, displayheight;
   private Semaphore semaphore;
   private Process sh;
@@ -51,7 +48,6 @@ public class Screenshot implements Serializable
 
   public Screenshot(int _displaywidth, int _displayheight, Context appContext)
   {
-    buf = new ByteArrayBuffer(0);
     shot = Bitmap.createBitmap(1920, 1280, Bitmap.Config.ARGB_8888);
     displaywidth = _displaywidth;
     displayheight = _displayheight;
@@ -193,7 +189,6 @@ public int getDominantColor()
       final int targetWidth = 400;
       int targetHeight = (int) (shot.getHeight() / (shot.getWidth() / (double) targetWidth));
       scaledShot = Bitmap.createScaledBitmap(shot, targetWidth, targetHeight, true);
-      oldshot = scaledShot;
       Palette pal = Palette.generate(scaledShot, 20);
       List<Palette.Swatch> swatches = pal.getSwatches();
 
@@ -217,7 +212,13 @@ public int getDominantColor()
         }
       }
 
-      clr = curSwatch.getRgb();
+      try
+      {
+        clr = curSwatch.getRgb();
+      } catch (NullPointerException e)
+      {
+        clr = oldClr;
+      }
       oldClr = clr;
 
       semaphore.release();

gradle.properties

@@ -16,5 +16,3 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-Ambilike.signing='C:/Users/th/Documents/owncloud/stuff/privat/android/thht'