0.6.11 release

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.owntracks.android"
-    android:versionCode="0610"
-    android:versionName="0.6.10">
+    android:versionCode="0611"
+    android:versionName="0.6.11">
 
     <uses-feature
         android:name="android.hardware.bluetooth_le"

CHANGELOG.md

@@ -1,6 +1,15 @@
 OwnTracks Android App Release Notes
 ===================================
 
+## OwnTracks 0.6.11
+>Release date: 2016-04-03
+* [FIX] #350 - visual glitches on 4.0.4
+* [FIX] #341 - remove the *map center* button on the *Friends* page
+* [FIX] #339 - custom certificates couldn't be imported from certain locations
+* [NEW] - Follow mode doesn't work in certain cases. It now auto engages from Friends view and after long pressing on details on map.
+* [NEW] - Due to popular demand, regions can be deleted by long pressing them
+* [NEW] - Setup wizard that allows to set the mode prior to the first connection
+
 ## OwnTracks 0.6.10
 >Release date: 2016-03-28 for beta testers
 * [FIX] #338 - Bluetooth beacon functionality can cause battery drain

build.gradle

@@ -53,7 +53,6 @@ dependencies {
     compile 'me.tatarka.bindingcollectionadapter:bindingcollectionadapter-recyclerview:1.0.0'
 
     // Widget libraries
-    compile 'com.github.curioustechizen.android-ago:library:1.3.0'
     compile 'com.rengwuxian.materialedittext:library:2.1.4'
     compile('com.mikepenz:fastadapter:1.1.2@aar') {
         transitive = true
@@ -62,10 +61,10 @@ dependencies {
     compile 'com.mikepenz:materialize:0.8.2@aar'
     compile 'com.mikepenz:iconics-core:2.5.1@aar'
     compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar'
-    compile('com.github.afollestad.material-dialogs:core:0.8.5.5@aar') {
+    compile('com.github.afollestad.material-dialogs:core:0.8.5.7@aar') {
         transitive = true
     }
-    compile('com.github.afollestad.material-dialogs:commons:0.8.5.5@aar') {
+    compile('com.github.afollestad.material-dialogs:commons:0.8.5.7@aar') {
         transitive = true
     }
     compile 'com.joanzapata.android:android-iconify:1.0.10'

src/main/java/org/owntracks/android/activities/ActivityRegions.java

@@ -78,26 +78,6 @@ public void run() {
 
         getSupportLoaderManager().initLoader(LOADER_ID, null, this);
 
-        ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
-            public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                if (!(viewHolder instanceof AdapterWaypoints.ItemViewHolder)) return 0;
-                return super.getSwipeDirs(recyclerView, viewHolder);
-            }
-
-            @Override
-            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-                return false;
-            }
-
-            @Override
-            public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
-                remove(viewHolder.getItemId());
-            }
-        };
-
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
-        itemTouchHelper.attachToRecyclerView(listView);
-
     }
 
     private void requery() {

src/main/java/org/owntracks/android/activities/ActivityWelcome.java

@@ -172,7 +172,7 @@ private void buildPagerCircles() {
 
         for (int i = 0; i < pagerAdapter.getCount(); i++) {
             ImageView circle = new ImageView(this);
-            circle.setImageResource(R.drawable.ic_fiber_manual_record_white_18dp);
+            circle.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_fiber_manual_record_white_18dp));
             circle.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
             circle.setAdjustViewBounds(true);
             circle.setPadding(padding, 0, padding, 0);
@@ -431,6 +431,7 @@ public void onNextClicked() {
     public static class PermissionFragment extends ScreenFragment {
         public static final int ID = 4;
         private static PermissionFragment instance;
+        private ImageView img;
 
         public static PermissionFragment getInstance() {
             if(instance == null)
@@ -457,6 +458,8 @@ public void onPermissionGranted() {
             success.setVisibility(View.VISIBLE);
             button.setVisibility(View.GONE);
 
+            img.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.ic_assignment_turned_in_white_48dp));
+
             ActivityWelcome.class.cast(getActivity()).enablePagerNext();
         }
 
@@ -479,8 +482,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
             button = (Button) v.findViewById(R.id.button);
             success = (TextView) v.findViewById(R.id.message);
-
-
+            img = (ImageView) v.findViewById(R.id.img);
 
             if(!permissionsGranted()) {
                 onPermissionDenied();
@@ -510,12 +512,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
 
-    private static class PlayFragment extends ScreenFragment implements DialogInterface.OnCancelListener {
+    public static class PlayFragment extends ScreenFragment implements DialogInterface.OnCancelListener {
         public static final int ID = 3;
         private static PlayFragment instance;
         private static GoogleApiAvailability googleAPI;
         private Button button;
         private TextView message;
+        private ImageView img;
 
         public static PlayFragment getInstance() {
             if(instance == null)
@@ -524,7 +527,7 @@ public static PlayFragment getInstance() {
             return instance;
         }
 
-        private PlayFragment() {
+        public   PlayFragment() {
             super();
             googleAPI = GoogleApiAvailability.getInstance();
         }
@@ -533,6 +536,7 @@ private PlayFragment() {
         public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
             ViewGroup v = (ViewGroup) inflater.inflate(R.layout.fragment_welcome_play, container, false);
 
+            img = (ImageView) v.findViewById(R.id.img);
             button = (Button) v.findViewById(R.id.recover);
             message = (TextView) v.findViewById(R.id.message);
 
@@ -583,7 +587,7 @@ public void onPlayServicesAvailable() {
             Log.v(TAG, "onPlayServicesAvailable()");
             message.setText(getString(R.string.play_services_now_available));
             button.setVisibility(View.GONE);
-
+            img.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.ic_assignment_turned_in_white_48dp));
             ActivityWelcome.class.cast(getActivity()).enablePagerNext();
         }
 
@@ -595,7 +599,7 @@ public void onPlayServicesUnavailableRecoverable(final int resultCode) {
             button.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-
+                    googleAPI.getErrorDialog(getActivity(), resultCode, RECOVER_PLAY).show();
                     PendingIntent p = googleAPI.getErrorResolutionPendingIntent(getActivity(), resultCode, RECOVER_PLAY);
                     try {
                         p.send();

src/main/java/org/owntracks/android/adapter/AdapterCursorLoader.java

@@ -15,14 +15,14 @@ public abstract class AdapterCursorLoader extends RecyclerView.Adapter<RecyclerV
 
     private static final String TAG = "AdapterCursorLoader";
     private static final String ID_COLUMN = "_id";
-    private final Context mContext;
     private OnViewHolderClickListener onViewHolderClickListener;
 
     public static class ClickableViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
         public View rootView;
         private OnViewHolderClickListener<ClickableViewHolder> onClickListener;
 
         private Drawable defaultBackground;
+
         public ClickableViewHolder(View view) {
             super(view);
             this.rootView = view;
@@ -33,20 +33,19 @@ public ClickableViewHolder(View view) {
         public void setSelected(boolean selected) {
             if(selected && !this.rootView.isSelected()) {
                 defaultBackground = this.rootView.getBackground();
-                this.rootView.setBackgroundDrawable(ContextCompat.getDrawable(this.rootView.getContext(), R.drawable.selectable_row));
+                this.rootView.setBackgroundResource(R.drawable.selectable_row);
                 this.rootView.setSelected(true);
-                return;
-            }
-
-            if(!selected && this.rootView.isSelected()) {
+            } else if(!selected && this.rootView.isSelected()) {
                 defaultBackground.setVisible(false, false);
-                this.rootView.setBackgroundDrawable(defaultBackground);
+                if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
+                    rootView.setBackgroundDrawable(defaultBackground);
+                } else {
+                    rootView.setBackground(defaultBackground);
+                }
+
                 this.rootView.setSelected(false);
                 defaultBackground.setVisible(true, false);
-
-                return;
             }
-
         }
 
         @Override
@@ -58,9 +57,7 @@ public void onClick(View v) {
 
         @Override
         public boolean onLongClick(View v) {
-            if(onClickListener != null)
-                return this.onClickListener.onViewHolderLongClick(v, this);
-            return false;
+            return onClickListener != null && this.onClickListener.onViewHolderLongClick(v, this);
         }
 
         public void setOnViewHolderClickListener(OnViewHolderClickListener listener) {
@@ -76,11 +73,9 @@ public void setOnViewHolderClickListener(OnViewHolderClickListener listener) {
 
 
     AdapterCursorLoader(Context context) {
-        mContext = context;
         mCursor = null;
         mDataValid = false;
         setHasStableIds(true);
-
     }
 
 

src/main/java/org/owntracks/android/adapter/AdapterWaypoints.java

@@ -6,20 +6,16 @@
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.github.curioustechizen.ago.RelativeTimeTextView;
 
 import org.owntracks.android.App;
 import org.owntracks.android.R;
 import org.owntracks.android.db.WaypointDao;
-import org.w3c.dom.Text;
 
 import java.util.Date;
 
@@ -61,8 +57,7 @@ public ItemViewHolder(View view) {
     @Override
     public ClickableViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
         View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.row_waypoint, parent, false);
-        ItemViewHolder vh = new ItemViewHolder(itemView);
-        return vh;
+        return new ItemViewHolder(itemView);
     }
 
 
@@ -71,12 +66,9 @@ public ClickableViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType
     public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, Cursor cursor, int position) {
         ((ItemViewHolder)viewHolder).mTitle.setText(cursor.getString(cursor.getColumnIndex(WaypointDao.Properties.Description.columnName)));
 
-        //((ItemViewHolder) viewHolder).mDetails.setReferenceTime(cursor.getLong(cursor.getColumnIndex(WaypointDao.Properties.LastTriggered.columnName)) * 1000);
-        //((ItemViewHolder) viewHolder).mTime.setPrefix("#" + cursor.getString(cursor.getColumnIndex(MessageDao.Properties.Channel.columnName)) + ", ");
         boolean geofence = cursor.getInt(cursor.getColumnIndex(WaypointDao.Properties.GeofenceRadius.columnName)) > 0;
         String uuid = cursor.getString(cursor.getColumnIndex(WaypointDao.Properties.BeaconUUID.columnName));
         boolean beaconUUID = uuid != null && uuid.length() > 0;
-        Log.v("AdapterWaypoints", "geofence " +geofence +  " uuid " + beaconUUID);
 
         if(geofence || beaconUUID) {
             long lastTriggered = cursor.getLong(cursor.getColumnIndex(WaypointDao.Properties.LastTriggered.columnName));

src/main/java/org/owntracks/android/support/BindingConversions.java

@@ -5,7 +5,6 @@
 import android.databinding.BindingMethod;
 import android.databinding.BindingMethods;
 
-import com.github.curioustechizen.ago.RelativeTimeTextView;
 
 public class BindingConversions {
     private static final String EMPTY_STRING = "";
@@ -28,9 +27,4 @@ public static String convertIntegerToString(Integer d) {
         return  d != null? d.toString() : EMPTY_STRING;
     }
 
-
-    @BindingAdapter("rttv:reference_time")
-    public static void setReferenceTime(RelativeTimeTextView view, long time) {
-        view.setReferenceTime(time);
-    }
 }

src/main/java/org/owntracks/android/support/Preferences.java

@@ -296,6 +296,10 @@ public static void importFromMessage(MessageConfiguration m) {
         if(m.containsKey(Keys.MODE_ID))
             setMode((Integer) m.get(Keys.MODE_ID));
 
+        // Don't show setup on first start if a config has been imported
+        setSetupCompleted();
+
+
         for(String key : m.getKeys()) {
             try {
                 Log.v(TAG, "import for key: " + key + " with value: " + m.get(key));

src/main/res/drawable/selectable_row.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Color when the row is selected -->
-    <item android:drawable="@color/md_grey_300b" />
+    <item android:drawable="@color/md_grey_300" />
 </selector>
 

src/main/res/layout/fragment_welcome_done.xml

@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:scaleType="centerInside"
-        android:src="@drawable/ic_verified_user_white_48dp"
+        android:src="@drawable/ic_done_all_white_48dp"
         android:layout_gravity="center_horizontal"
         android:layout_alignParentTop="true"
 
@@ -34,9 +34,9 @@
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:gravity="bottom|center_horizontal"
-        android:layout_alignLeft="@+id/radioSex"
-        android:layout_alignStart="@+id/radioSex"
-        android:layout_below="@+id/img" />
+        android:layout_below="@+id/img"
+        android:layout_marginBottom="8dp"
+        />
 
     <TextView
         android:id="@+id/screen_desc"

src/main/res/layout/fragment_welcome_intro.xml

@@ -9,8 +9,8 @@
 
 
     <ImageView
-        android:layout_marginTop="48dp"
-        android:layout_marginBottom="48dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginBottom="32dp"
 
 
         android:id="@+id/img"
@@ -35,7 +35,7 @@
         android:text="Welcome"
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
-
+        android:layout_marginBottom="8dp"
         android:layout_below="@+id/img"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true" />

src/main/res/layout/fragment_welcome_mode.xml

@@ -34,9 +34,9 @@
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:gravity="bottom|center_horizontal"
-        android:layout_alignLeft="@+id/radioSex"
-        android:layout_alignStart="@+id/radioSex"
-        android:layout_below="@+id/img" />
+        android:layout_below="@+id/img"
+        android:layout_marginBottom="8dp"
+        />
 
     <TextView
         android:id="@+id/screen_desc"