API compatibility, cleanup, fixed many warnings

carlinchisart · Feb 23, 2015 · 637839c · 637839c
1 parent 044ea47
commit 637839c
Show file tree

Hide file tree

Showing 105 changed files with 322 additions and 970 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.owntracks.android"
-    android:versionCode="0502"
-    android:versionName="0.5.02" >
+          package="org.owntracks.android"
+          android:versionCode="0502"
+          android:versionName="0.5.02" >
 
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
-
-    <uses-feature
-        android:glEsVersion="0x00020000"
-        android:required="true" />
-
-    <meta-data
-        android:name="com.google.android.gms.version"
-        android:value="@integer/google_play_services_version" />
+    <uses-feature  android:glEsVersion="0x00020000"  android:required="true" />
 
     <uses-permission android:name="android.permission.INTERNET" /> <!-- To access the network -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- To handle connectivity changes and reconnect -->
@@ -37,6 +27,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.Owntracks" >
+
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
             android:value="@string/GOOGLE_MAPS_API_KEY" />
@@ -83,6 +74,40 @@
                 <data android:scheme="content" />
                 <data android:pathPattern=".*\\.otrc" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.EDIT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/octet-stream"
+                    android:pathPattern=".*\\.otrc" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.EDIT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/otrc"
+                    android:pathPattern=".*\\.otrc" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.EDIT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="text/plain"
+                    android:pathPattern=".*\\.otrc" />
+            </intent-filter>
         </activity>
 
 
@@ -123,49 +148,6 @@
                 android:resource="@xml/filepaths" />
         </provider>
 
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <action android:name="android.intent.action.EDIT" />
-
-            <category android:name="android.intent.category.DEFAULT" />
-
-            <data
-                android:host="*"
-                android:mimeType="application/octet-stream"
-                android:pathPattern=".*\\.otrc" />
-        </intent-filter>
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <action android:name="android.intent.action.EDIT" />
-
-            <category android:name="android.intent.category.DEFAULT" />
-
-            <data
-                android:host="*"
-                android:mimeType="application/otrc"
-                android:pathPattern=".*\\.otrc" />
-        </intent-filter>
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <action android:name="android.intent.action.EDIT" />
-
-            <category android:name="android.intent.category.DEFAULT" />
-
-            <data
-                android:host="*"
-                android:mimeType="text/plain"
-                android:pathPattern=".*\\.otrc" />
-        </intent-filter>
->
-
-        <!-- <activity -->
-        <!-- android:name=".ActivityWizzard" -->
-        <!-- android:label="@string/title_activity_activity_wizzard" > -->
-        <!-- </activity> -->
-        <!-- <activity -->
-        <!-- android:name="org.owntracks.android.preferences.ActivityExport" -->
-        <!-- android:label="@string/title_activity_activity_export" > -->
-        <!-- </activity> -->
 
         <activity
             android:name=".ActivityWaypoints"

diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,6 @@
+Steps to create an official release
+> mv apk/android-release.apk apk/owntracks.apk
+> git commit -am "Android-v.0.X.XX APK"
+> git tag -a Android-v.0.X.XX -m "TAG Android-v.0.X.XX"
+> Create release with APK
+> Upload to Play Store
diff --git a/android.iml b/android.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
@@ -24,7 +24,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -33,12 +33,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

diff --git a/build.gradle b/build.gradle
@@ -4,11 +4,11 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 repositories {
     maven { url 'https://repo.eclipse.org/content/repositories/paho-releases/' }

diff --git a/src/main/java/org/owntracks/android/ActivityLauncher.java b/src/main/java/org/owntracks/android/ActivityLauncher.java
@@ -2,7 +2,6 @@
 
 import org.owntracks.android.services.ServiceApplication;
 import org.owntracks.android.services.ServiceProxy;
-import org.owntracks.android.support.Preferences;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -73,26 +72,11 @@ protected void onResume() {
 		super.onResume();
 
 		checkPlayServices();
-        checkSettings();
-
-		if (this.playServicesOk)
-			checkSettings();
 
 		if (this.playServicesOk && this.settingsOK)
 			launchChecksComplete();
 	}
 
-    private void checkSettings() {
-
-        settingsOK = true; // for now
-        if(!settingsOK)
-            startActivityWizzard();
-
-        Log.v(this.toString(), "Preflight check passed: " + settingsOK);
-    }
-
-
-
 	private void checkPlayServices() {
 
 		if (ServiceApplication.checkPlayServices()) {
@@ -199,10 +183,6 @@ public void startActivityMain() {
 		startActivityFromClass(ActivityMain.class);
 	}
 
-	public void startActivityWizzard() {
-		// startActivityFromClass(ActivityWizzard.class);
-	}
-
 	public void startActivityFromClass(Class<?> c) {
 		Intent intent = new Intent(this.context, c);
 		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP

diff --git a/src/main/java/org/owntracks/android/ActivityMain.java b/src/main/java/org/owntracks/android/ActivityMain.java
@@ -105,9 +105,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id,
 
                 switch (drawerItem.getIdentifier()) {
                     case R.string.idLocations:
-                        if (ActivityMain.FragmentHandler.getInstance().atRoot()) {
-                            // Already at root, do nothing
-                        } else {
+                        if (!ActivityMain.FragmentHandler.getInstance().atRoot()) {
                             // We're showing the root and rolling back the complete back stack so we discard it
                             FragmentHandler.getInstance().clearBackStack();
                             FragmentHandler.getInstance().showFragment(FragmentHandler.getInstance().getRoot(), null, (ActionBarActivity) context, FragmentHandler.DIRECTION_BACK);
@@ -168,10 +166,10 @@ public static class FragmentHandler extends Fragment {
 
         static FragmentHandler instance;
 
-		private static HashMap<Class<?>, Bundle> store = new HashMap<Class<?>, Bundle>();
-		private static ConcurrentHashMap<Class<?>, Fragment> fragments = new ConcurrentHashMap<Class<?>, Fragment>();
+		private static HashMap<Class<?>, Bundle> store = new HashMap<>();
+		private static ConcurrentHashMap<Class<?>, Fragment> fragments = new ConcurrentHashMap<>();
 
-		private static LinkedList<Class<?>> backStack = new LinkedList<Class<?>>();
+		private static LinkedList<Class<?>> backStack = new LinkedList<>();
 
 		@Override
 		public void onCreate(Bundle savedInstanceState) {
@@ -316,7 +314,7 @@ public void pushBackStack(Class<?> c) {
             backStack.addLast(c);
 		}
         public void clearBackStack() {
-            backStack.clear();;
+            backStack.clear();
             return;
         }
 		public Class<?> popBackStack() {
@@ -1091,11 +1089,6 @@ public boolean onContextItemSelected(MenuItem item)
 
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
-     //       if(item.getItemId() == R.id.menu_mylocation) {
-       //         FragmentHandler.getInstance().forward(MapFragment)
-         //       return true;
-          //  }
-
             return super.onOptionsItemSelected(item);
         }
 

diff --git a/src/main/java/org/owntracks/android/ActivityPreferences.java b/src/main/java/org/owntracks/android/ActivityPreferences.java
@@ -1,10 +1,6 @@
 package org.owntracks.android;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -19,15 +15,10 @@
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
-import android.transition.Fade;
-import android.transition.Transition;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
 
 import com.mikepenz.materialdrawer.Drawer;
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;

diff --git a/src/main/java/org/owntracks/android/ActivityWaypoint.java b/src/main/java/org/owntracks/android/ActivityWaypoint.java
@@ -2,56 +2,41 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.opengl.Visibility;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.Switch;
 import android.widget.TextView;
 
 import com.google.android.gms.location.Geofence;
-import com.mikepenz.materialdrawer.Drawer;
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 
-import org.owntracks.android.adapter.WaypointAdapter;
 import org.owntracks.android.db.Waypoint;
 import org.owntracks.android.db.WaypointDao;
 import org.owntracks.android.model.GeocodableLocation;
 import org.owntracks.android.services.ServiceProxy;
-import org.owntracks.android.support.DrawerFactory;
 import org.owntracks.android.support.Events;
-import org.owntracks.android.support.ReverseGeocodingTask;
 import org.owntracks.android.support.StaticHandler;
 import org.owntracks.android.support.StaticHandlerInterface;
 
-import java.sql.Date;
-import java.util.ArrayList;
-
 import de.greenrobot.dao.DaoException;
 import de.greenrobot.dao.query.Query;
 import de.greenrobot.event.EventBus;
 
 
 public class ActivityWaypoint extends ActionBarActivity implements StaticHandlerInterface {
     private WaypointDao dao;
-    TextWatcher requiredForSave;
+    private TextWatcher requiredForSave;
     private GeocodableLocation currentLocation;
     private Handler handler;
     private TextView waypointListPlaceholder;

diff --git a/src/main/java/org/owntracks/android/ActivityWaypoints.java b/src/main/java/org/owntracks/android/ActivityWaypoints.java
@@ -104,7 +104,7 @@ public void run() {
 
         this.dao = App.getWaypointDao();
         this.handler = new StaticHandler(this);
-        this.listAdapter = new WaypointAdapter(this, new ArrayList<Waypoint>(this.dao.loadAll()));
+        this.listAdapter = new WaypointAdapter(this, new ArrayList<>(this.dao.loadAll()));
 
         this.listView = (ListView) findViewById(R.id.waypoints);
         this.listView.setAdapter(this.listAdapter);