Merge tag 'v1.2.5'

Author: mattvb91

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "mavonie.subterminal"
         minSdkVersion 19
         targetSdkVersion 24
-        versionCode 29
-        versionName "1.2.1"
+        versionCode 33
+        versionName "1.2.5"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -44,14 +44,17 @@ dependencies {
         exclude group: 'com.android.support', module: 'design'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
-    compile('com.facebook.fresco:fresco:1.2.0') {
+    compile('com.facebook.fresco:fresco:1.3.0') {
         exclude group: 'com.parse.bolts', module: 'bolts-tasks';
     }
     compile 'com.google.firebase:firebase-core:10.2.1'
     compile 'com.google.firebase:firebase-crash:10.2.1'
     compile 'com.google.firebase:firebase-messaging:10.2.1'
     compile 'com.google.firebase:firebase-ads:10.2.1'
 
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+
     compile 'co.lujun:androidtagview:1.0.5'
     compile 'com.github.developer-shivam:crescento:1.1.0'
     compile 'com.flaviofaria:kenburnsview:1.0.7'

app/proguard-rules.pro

@@ -26,7 +26,15 @@
 -keep class com.birbit.android.jobqueue.** { *; }
 
 -dontwarn okio.**
--keep class okio.** { *; }
 
--dontwarn retrofit2.**
--keep class retrofit2.** { *; }
+-dontwarn retrofit.**
+-keep class retrofit.** { *; }
+
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="mavonie.subterminal"
-          android:versionName="1.2.1">
+          android:versionName="1.2.5">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_GPS"/>

app/src/main/java/mavonie/subterminal/Dashboard.java

@@ -38,6 +38,8 @@
 import java.util.List;
 import java.util.Map;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
 import mavonie.subterminal.Models.Exit;
 import mavonie.subterminal.Models.Jump;
 import mavonie.subterminal.Models.Model;
@@ -57,28 +59,20 @@ public class Dashboard extends Fragment {
 
     private static final int ANIMATION_SPEED = 1000;
 
-    PieChart mChart;
-    BarChart favouriteExits;
-    LineChart pullLineChart;
+    @BindView(R.id.dashboard_base_objects_pie) PieChart mChart;
+    @BindView(R.id.dashboard_base_fav_exits) BarChart favouriteExits;
+    @BindView(R.id.dashboard_pull_height_linechart) LineChart pullLineChart;
 
-    TextView skydiveCount;
-    TextView baseCount;
-    TextView dropzoneCount;
-    TextView exitsCount;
+    @BindView(R.id.dashboard_skydive_count) TextView skydiveCount;
+    @BindView(R.id.dashboard_base_count) TextView baseCount;
+    @BindView(R.id.dashboard_dropzone_count) TextView dropzoneCount;
+    @BindView(R.id.dashboard_exits_count) TextView exitsCount;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_dashboard, container, false);
-
-        mChart = (PieChart) view.findViewById(R.id.dashboard_base_objects_pie);
-        favouriteExits = (BarChart) view.findViewById(R.id.dashboard_base_fav_exits);
-        pullLineChart = (LineChart) view.findViewById(R.id.dashboard_pull_height_linechart);
-
-        skydiveCount = (TextView) view.findViewById(R.id.dashboard_skydive_count);
-        baseCount = (TextView) view.findViewById(R.id.dashboard_base_count);
-        dropzoneCount = (TextView) view.findViewById(R.id.dashboard_dropzone_count);
-        exitsCount = (TextView) view.findViewById(R.id.dashboard_exits_count);
+        ButterKnife.bind(this, view);
 
         clickableSummaryStats(view);
 

app/src/main/java/mavonie/subterminal/Forms/ExitForm.java

@@ -142,6 +142,20 @@ public void onClick(View v) {
             }
         });
 
+        exit_edit_lat.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus)
+                    locationManager.removeUpdates(locationListener);
+            }
+        });
+
+        exit_edit_long.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus)
+                    locationManager.removeUpdates(locationListener);
+            }
+        });
+
         heightUnit = (RadioGroup) view.findViewById(R.id.height_unit_radio_group);
         UIHelper.prefillHeightUnit(heightUnit);
 
@@ -271,4 +285,10 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
     public void onNothingSelected(AdapterView<?> parent) {
 
     }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        locationManager.removeUpdates(locationListener);
+    }
 }

app/src/main/java/mavonie/subterminal/Forms/JumpForm.java

@@ -312,10 +312,11 @@ protected void updateForm() {
                 this.suits.putAll(new Suit().getItemsForSpinner(convertTypes(getItem().getType())));
                 this.suitsAdapter.notifyDataSetChanged();
             }
+
             suitSpinner.setAdapter(this.suitsAdapter);
-            if (getItem().getSuitId() != null) {
-                suitEntry = suitsAdapter.getItem(this.suitsAdapter.findPositionFromKey(getItem().getSuitId()));
-                suitSpinner.setSelection(this.suitsAdapter.findPositionFromKey(getItem().getSuitId()), false);
+            if (getItem().getSuit() != null) {
+                suitEntry = suitsAdapter.getItem(this.suitsAdapter.findPositionFromKey(getItem().getSuit().getId()));
+                suitSpinner.setSelection(this.suitsAdapter.findPositionFromKey(getItem().getSuit().getId()), false);
             }
 
             if (getItem().getPcConfig() != null) {

app/src/main/java/mavonie/subterminal/Login.java

@@ -0,0 +1,79 @@
+package mavonie.subterminal;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import mavonie.subterminal.Utils.Subterminal;
+import mavonie.subterminal.Utils.UIHelper;
+
+/**
+ * Login handling
+ */
+public class Login extends Fragment {
+
+    @BindView(R.id.email_edittext) EditText email;
+    @BindView(R.id.password_edittext) EditText password;
+
+    @OnClick(R.id.facebook_login_button) void facebookDialog() {
+        UIHelper.facebookDialog();
+    }
+
+    @OnClick(R.id.register_button) void registerButtonPressed() {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://subterminal.eu/register"));
+        startActivity(browserIntent);
+    }
+
+    @OnClick(R.id.reset_password_button) void resetPasswordPressed() {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://subterminal.eu/password/reset"));
+        startActivity(browserIntent);
+    }
+
+    @OnClick(R.id.sign_in_button) void signInPressed() {
+        //Make sure email & password have been filed.
+        if (email.getText().toString().isEmpty()) {
+            email.setError("Email Required");
+            return;
+        }
+
+        if (password.getText().toString().isEmpty()) {
+            password.setError("Password Required");
+            return;
+        }
+
+        Subterminal.getApi().authenticate(email.getText().toString(), password.getText().toString());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        if(Subterminal.getUser().isLoggedIn()) {
+            UIHelper.goToFragment(R.id.nav_dashboard);
+        }
+
+        View view = inflater.inflate(R.layout.fragment_login, container, false);
+
+        if(MainActivity.getActivity().getOptionsMenu() != null)
+            MainActivity.getActivity().getOptionsMenu().findItem(R.id.action_filter).setVisible(false);
+
+        UIHelper.getAddButton().hide();
+
+        ButterKnife.bind(this, view);
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MainActivity.getActivity().setTitle("Sign In");
+    }
+}

app/src/main/java/mavonie/subterminal/MainActivity.java

@@ -179,16 +179,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public boolean onNavigationItemSelected(final MenuItem item) {
 
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+
         //Checks for items where we dont want the drawer to close
         if (item.getItemId() == R.id.nav_login) {
-            UIHelper.facebookDialog();
+            UIHelper.replaceFragment(new Login());
+            drawer.closeDrawer(Gravity.LEFT);
             return true;
         } else if (item.getItemId() == R.id.nav_mode) {
             UIHelper.switchModeDialog();
             return true;
         }
 
-        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(Gravity.LEFT);
 
         new Handler().postDelayed(new Runnable() {

app/src/main/java/mavonie/subterminal/Models/Exit.java

@@ -377,6 +377,11 @@ public static List<Exit> getExitsForDelete() {
         return new Exit().getItems(params);
     }
 
+    @Override
+    public boolean delete() {
+        return this.delete(true);
+    }
+
     public boolean delete(boolean updateJumps) {
 
         //We need to update jumps before deleting
@@ -390,54 +395,6 @@ public boolean delete(boolean updateJumps) {
         return super.delete();
     }
 
-    @Override
-    protected void populateContentValues(ContentValues contentValues) {
-
-        if (this._id > 0) {
-            contentValues.put(_ID, this._id);
-        }
-
-        moveExistingExit();
-        super.populateContentValues(contentValues);
-    }
-
-    /**
-     * This method is only used when a remote_id attribute is set.
-     * We need to check if we already have an exit in this position and shuffle it out to a new unused ID
-     */
-    private void moveExistingExit() {
-        if (this.remote_id != null) {
-            //Check if we need to move an existing item out of the way.
-            Exit existingExit = (Exit) new Exit().getOneById(this.remote_id);
-
-            if (existingExit != null) {
-                //get the newId BEFORE deleting existing exit to prevent overlapping
-                int newId = new Exit().getNextAutoIncrement();
-
-                existingExit.setDeleted(DELETED_TRUE);
-                existingExit.delete(false);
-
-                if (existingExit.getDetails() != null) {
-                    existingExit.getDetails().setExitId(newId);
-                    existingExit.getDetails().save();
-                }
-
-                existingExit._id = newId;
-                existingExit.markSynced();
-            }
-
-            //Check if we have a global exit with the same incoming name, if we do, remove it
-            Exit globalExit = (Exit) new Exit().getItem(new Pair<String, String>(COLUMN_NAME_NAME, this.getName()));
-            if (globalExit != null && globalExit.isGlobal()) {
-                if (globalExit.getDetails() != null) {
-                    globalExit.getDetails().delete();
-                }
-                globalExit.setDeleted(DELETED_TRUE);
-                globalExit.delete();
-            }
-        }
-    }
-
     /**
      * Get the top jumped exits
      *
@@ -451,7 +408,13 @@ public static LinkedHashMap<Exit, Integer> getTop3Exits() {
 
         if (cursor.moveToFirst()) {
             while (cursor.isAfterLast() == false) {
-                results.put((Exit) new Exit().getOneById(cursor.getInt(0)), cursor.getInt(1));
+                int exitId = cursor.getInt(0);
+                int jumpsFromExit = cursor.getInt(1);
+                Exit exit = (Exit) new Exit().getOneById(exitId);
+
+                if (exitId != 0 && exit != null) {
+                    results.put(exit, jumpsFromExit);
+                }
                 cursor.moveToNext();
             }
         }

app/src/main/java/mavonie/subterminal/Models/Image.java

@@ -28,6 +28,7 @@
 import mavonie.subterminal.R;
 import mavonie.subterminal.Utils.Subterminal;
 import mavonie.subterminal.Utils.Synchronized;
+import mavonie.subterminal.Utils.UIHelper;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -253,6 +254,7 @@ public static Image createFromPath(String originalPath, Model model) {
 
         } catch (IOException e) {
             e.printStackTrace();
+            UIHelper.toast(e.getMessage());
         }
 
         return null;