clean up code (part 1); widget create activity improved; widget default values

Author: David Gräff

.idea/workspace.xml

@@ -20,6 +20,8 @@ android {
         versionName "5.7.2"
         applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
+        testInstrumentationRunner "android.test.InstrumentationTestRunner"
+        resConfig "de"
     }
 
     lintOptions {
@@ -31,6 +33,15 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    def getRevision = { ->
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'rev-parse', '--short', 'HEAD'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+
     buildTypes {
         release {
             zipAlign true
@@ -41,6 +52,7 @@ android {
             debuggable false
         }
         debug {
+            versionNameSuffix "-" + getRevision()
             applicationIdSuffix ".debug"
             resValue "string", "authority", appID + ".utils.AssetDocumentProvider.Debug"
             //buildConfigField "String", "AUTHORITY", appID + ".utils.AssetDocumentProvider.Debug"
@@ -50,6 +62,11 @@ android {
         }
     }
     sourceSets { main { java.srcDirs = ['src/main/java', 'src/tests/java'] } }
+
+    aaptOptions {
+        //noCompress 'txt'
+        ignoreAssetsPattern "!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }
 }
 
 dependencies {

app/build.gradle

@@ -179,15 +179,15 @@ public void startElement(String uri,
             if (current.hour_minute_start == -1)
                 complete_post_data[0] += "99:99";
             else
-                complete_post_data[0] += URLEncoder.encode(current.time(current.hour_minute_start), "utf-8");
+                complete_post_data[0] += URLEncoder.encode(Timer.time(current.hour_minute_start), "utf-8");
             complete_post_data[0] += "&";
 
             // off-time
             complete_post_data[0] += "T3" + timer + "=";
             if (current.hour_minute_stop == -1)
                 complete_post_data[0] += "99:99";
             else
-                complete_post_data[0] += URLEncoder.encode(current.time(current.hour_minute_stop), "utf-8");
+                complete_post_data[0] += URLEncoder.encode(Timer.time(current.hour_minute_stop), "utf-8");
             complete_post_data[0] += "&";
 
             if (i == 4) {
@@ -196,7 +196,7 @@ public void startElement(String uri,
                 if (current.hour_minute_random_interval == -1)
                     complete_post_data[0] += "99:99";
                 else
-                    complete_post_data[0] += URLEncoder.encode(current.time(current.hour_minute_random_interval), "utf-8");
+                    complete_post_data[0] += URLEncoder.encode(Timer.time(current.hour_minute_random_interval), "utf-8");
                 complete_post_data[0] += "&";
             }
         }

app/src/lint-result.xml

@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -67,6 +68,10 @@ public static UUID uuidFromWidgetID(int widgetId) {
         return new UUID(0xABCD, (long) widgetId);
     }
 
+    public static UUID uuidFromDefaultWidget() {
+        return new UUID(0xABCE, 0);
+    }
+
     public static int getResIdForState(IconState state) {
         switch (state) {
             case StateOff:
@@ -262,10 +267,14 @@ public void onClick(DialogInterface dialogInterface, int i) {
                                 PICK_IMAGE_BEFORE_KITKAT
                         );
                     } else {
-                        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-                        intent.setType("image/*");
-                        intent.addCategory(Intent.CATEGORY_OPENABLE);
-                        callback.startActivityForResult(intent, PICK_IMAGE_KITKAT);
+                        try {
+                            Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+                            intent.setType("image/*");
+                            intent.addCategory(Intent.CATEGORY_OPENABLE);
+                            callback.startActivityForResult(intent, PICK_IMAGE_KITKAT);
+                        } catch (ActivityNotFoundException ignored) {
+                            Toast.makeText(context, "Cannot open file chooser", Toast.LENGTH_SHORT).show();
+                        }
                     }
 
                 } else {
@@ -297,6 +306,7 @@ public static void activityCheckForPickedImage(final Context context,
         }
     }
 
+
     public static enum IconType {
         SceneIcon,
         WidgetIcon,

app/src/main/java/oly/netpowerctrl/anel/AnelPluginHttp.java

@@ -26,7 +26,7 @@
  */
 public class LoadStoreJSonData {
 
-    private onStorageUpdate storageUpdate = new onStorageUpdate() {
+    private final onStorageUpdate storageUpdate = new onStorageUpdate() {
         @Override
         public void save(CollectionWithType collection, Storable item) {
             File file = new File(App.instance.getDir(collection.type(), 0), item.getStorableName());

app/src/main/java/oly/netpowerctrl/data/LoadStoreIconData.java

@@ -8,6 +8,7 @@
 import android.os.Parcel;
 import android.preference.PreferenceManager;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -27,11 +28,12 @@ public class SharedPrefs implements SharedPreferences.OnSharedPreferenceChangeLi
     public final static String PREF_WIDGET_BASENAME = "oly.netpowerctrl.widget";
     public final static String hide_not_reachable = "hide_not_reachable";
     private final static int PREF_CURRENT_VERSION = 4;
+    private final static String firstTabExtraFilename = "firstTabExtra";
     public final String PREF_use_dark_theme = "use_dark_theme";
     public final String PREF_show_persistent_notification = "show_persistent_notification";
     private final Context context;
-    private WeakHashMap<IShowBackground, Boolean> observers_showBackground = new WeakHashMap<>();
-    private WeakHashMap<IHideNotReachable, Boolean> observers_HideNotReachable = new WeakHashMap<>();
+    private final WeakHashMap<IShowBackground, Boolean> observers_showBackground = new WeakHashMap<>();
+    private final WeakHashMap<IHideNotReachable, Boolean> observers_HideNotReachable = new WeakHashMap<>();
 
     private SharedPrefs() {
         this.context = App.instance;
@@ -69,9 +71,13 @@ public String getFirstTab() {
     }
 
     public Bundle getFirstTabExtra() {
+        File file = context.getFileStreamPath(firstTabExtraFilename);
+        if (!file.exists())
+            return null;
+
         Parcel parcel = Parcel.obtain(); //creating empty parcel object
         try {
-            FileInputStream fis = context.openFileInput("firstTabExtra");
+            FileInputStream fis = context.openFileInput(firstTabExtraFilename);
             byte[] array = new byte[(int) fis.getChannel().size()];
             fis.read(array, 0, array.length);
             fis.close();
@@ -96,7 +102,7 @@ public void setFirstTab(String fragmentClassName, Bundle extra) {
         if (extra != null) {
             Parcel parcel = Parcel.obtain(); //creating empty parcel object
             try {
-                FileOutputStream fos = context.openFileOutput("firstTabExtra", Context.MODE_PRIVATE);
+                FileOutputStream fos = context.openFileOutput(firstTabExtraFilename, Context.MODE_PRIVATE);
                 extra.writeToParcel(parcel, 0); //saving bundle as parcel
                 fos.write(parcel.marshall()); //writing parcel to file
                 fos.flush();
@@ -106,7 +112,8 @@ public void setFirstTab(String fragmentClassName, Bundle extra) {
             } finally {
                 parcel.recycle();
             }
-
+        } else {
+            context.deleteFile(firstTabExtraFilename);
         }
     }
 
@@ -238,7 +245,7 @@ public boolean isPreferenceNameLogEnergySaveMode(String name) {
         return name.equals("use_log_energy_saving_mode");
     }
 
-    public String getVersionName(Context context) {
+    String getVersionName(Context context) {
         try {
             Class cls = App.class;
             ComponentName comp = new ComponentName(context, cls);
@@ -330,6 +337,12 @@ public long getLastTimeOpenIssuesRequested() {
         return prefs.getLong("open_issues_last_access", -1);
     }
 
+    public boolean getSmallerClickExecuteArea() {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean value = context.getResources().getBoolean(R.bool.smaller_click_execute_area);
+        return prefs.getBoolean("smaller_click_execute_area", value);
+    }
+
     public void setOpenIssues(int value, long last_access) {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -367,6 +380,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
         }
     }
 
+
     public interface IShowBackground {
         void backgroundChanged(boolean showBackground);
     }

app/src/main/java/oly/netpowerctrl/data/LoadStoreJSonData.java

@@ -13,8 +13,6 @@
 public interface Storable {
     public StorableDataType getDataType();
 
-    ;
-
     public String getStorableName();
 
     public void load(JsonReader reader) throws IOException, ClassNotFoundException;

app/src/main/java/oly/netpowerctrl/data/SharedPrefs.java

@@ -16,7 +16,7 @@ public class DevicePortAdapterItem {
     // command_value instead overwriting DevicePort's value. The implementation
     // depends on the child class.
     int command_value;
-    boolean marked_removed = false;
+    private boolean marked_removed = false;
     private UUID group;
     private groupTypeEnum groupType = groupTypeEnum.NOGROUP_TYPE;
 
@@ -85,7 +85,7 @@ public groupTypeEnum groupType() {
         return groupType;
     }
 
-    public void setGroupType(groupTypeEnum groupType) {
+    void setGroupType(groupTypeEnum groupType) {
         this.groupType = groupType;
     }
 

app/src/main/java/oly/netpowerctrl/data/Storable.java

@@ -35,18 +35,18 @@
 public class DevicePortsBaseAdapter extends BaseAdapter implements SortCriteriaInterface,
         SharedPrefs.IShowBackground {
 
-    protected final IconDeferredLoadingThread mIconCache;
+    final IconDeferredLoadingThread mIconCache;
     final List<DevicePortAdapterItem> mItems;
     private final LayoutInflater mInflater;
     // Source of values for this adapter.
     private final DevicePortSource mSource;
-    protected int mOutlet_res_id = 0;
-    protected boolean mShowHidden = true;
-    protected DevicePortViewHolder cViewHolder;
+    int mOutlet_res_id = 0;
+    boolean mShowHidden = true;
+    DevicePortViewHolder cViewHolder;
     // Some observers
-    protected ListItemMenu mListContextMenu;
+    ListItemMenu mListContextMenu;
     // Animation ids
-    protected WeakReference<AnimationController> mAnimationWeakReference = new WeakReference<>(null);
+    WeakReference<AnimationController> mAnimationWeakReference = new WeakReference<>(null);
     private boolean drawShadows;
     private int mNextId = 0; // we need stable IDs
     // If you change the layout or an image we increment this layout change id
@@ -69,7 +69,7 @@ public class DevicePortsBaseAdapter extends BaseAdapter implements SortCriteriaI
             source.setTargetAdapter(this);
         }
         drawShadows = SharedPrefs.getInstance().isBackground();
-        SharedPrefs.getInstance().getInstance().registerShowBackground(this);
+        SharedPrefs.getInstance().registerShowBackground(this);
     }
 
     @Override
@@ -264,6 +264,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
                     port.Hidden ? Typeface.ITALIC : Typeface.NORMAL);
             cViewHolder.title.setText(port.getDescription());
             cViewHolder.title.setEnabled(item.isEnabled());
+
             if (drawShadows)
                 cViewHolder.title.setShadowLayer(4f, 0, 0, Color.WHITE);
 
@@ -453,7 +454,7 @@ public void addItem(DevicePort devicePort, int command_value, boolean finalActio
      */
     private boolean addItemToGroup(DevicePort devicePort, int command_value, int start_position) {
         boolean found = false;
-        AnimationController a = mAnimationWeakReference.get();
+//        AnimationController a = mAnimationWeakReference.get();
 
         int destination_index = mItems.size();
         for (int i = start_position; i < mItems.size(); ++i) {