diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/app/build.gradle b/app/build.gradle
index fba8527..8ceb8b2 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 19
-        versionCode 5
-        versionName "2.0.1"
+        versionCode 6
+        versionName "2.0.2"
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index 21b67de..ed22404
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.thedarken.audiobug">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="eu.thedarken.audiobug">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -17,7 +18,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.NoTitleBar">
+        android:theme="@android:style/Theme.NoTitleBar"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
             android:theme="@style/Theme.AppCompat">
@@ -30,9 +32,9 @@
         <activity
             android:name=".PreferencesActivity"
             android:label="@string/settings"
-            android:theme="@style/Theme.AppCompat"></activity>
+            android:theme="@style/Theme.AppCompat"/>
 
-        <service android:name=".AudioBugService"></service>
+        <service android:name=".AudioBugService"/>
 
         <receiver android:name=".RecorderWidget">
             <intent-filter>
diff --git a/app/src/main/java/eu/thedarken/audiobug/AudioBugService.java b/app/src/main/java/eu/thedarken/audiobug/AudioBugService.java
old mode 100644
new mode 100755
index d210e36..1782784
--- a/app/src/main/java/eu/thedarken/audiobug/AudioBugService.java
+++ b/app/src/main/java/eu/thedarken/audiobug/AudioBugService.java
@@ -47,15 +47,15 @@ public class AudioBugService extends Service implements Recorder.RecorderCallbac
     private Binder mBinder;
 
     public class LocalBinder extends Binder {
-        public boolean isRecording() {
+        boolean isRecording() {
             return mRecorder != null;
         }
 
-        public void toggleRecorder() {
+        void toggleRecorder() {
             toggleRecording();
         }
 
-        public void setRecorderListener(Recorder.RecorderCallback callback) {
+        void setRecorderListener(Recorder.RecorderCallback callback) {
             if (callback != null && isRecording())
                 callback.onRecordingStarted();
 
diff --git a/app/src/main/java/eu/thedarken/audiobug/ConfigurationFragment.java b/app/src/main/java/eu/thedarken/audiobug/ConfigurationFragment.java
old mode 100644
new mode 100755
index 9598c97..c3fb7b2
--- a/app/src/main/java/eu/thedarken/audiobug/ConfigurationFragment.java
+++ b/app/src/main/java/eu/thedarken/audiobug/ConfigurationFragment.java
@@ -94,7 +94,7 @@ public void onStartTrackingTouch(SeekBar arg0) {
 
             @Override
             public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
-                tvShakeThreshold.setText(getString(R.string.shake_slider_threshold, arg1));
+                tvShakeThreshold.setText(getString(R.string.shake_slider_threshold, String.valueOf(arg1)));
             }
         });
         int shakeThreshold = mSettings.getInt(ShakeTrigger.KEY_SHAKE_THRESHOLD, 1000);
@@ -115,7 +115,7 @@ public void onStartTrackingTouch(SeekBar arg0) {
 
             @Override
             public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
-                tvShakeCount.setText(getString(R.string.shake_slider_count, arg1));
+                tvShakeCount.setText(getString(R.string.shake_slider_count, String.valueOf(arg1)));
             }
         });
         int shakeCount = mSettings.getInt(ShakeTrigger.KEY_SHAKE_COUNT, 3);
@@ -136,7 +136,7 @@ public void onStartTrackingTouch(SeekBar arg0) {
 
             @Override
             public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
-                tvShakeTimeout.setText(getString(R.string.shake_slider_timeout, arg1));
+                tvShakeTimeout.setText(getString(R.string.shake_slider_timeout, String.valueOf(arg1)));
             }
         });
         int shakeTimeout = mSettings.getInt(ShakeTrigger.KEY_SHAKE_TIMEOUT, 300);
@@ -157,7 +157,7 @@ public void onStartTrackingTouch(SeekBar arg0) {
 
             @Override
             public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
-                tvProximityCount.setText(getString(R.string.proximity_slider_taps, arg1));
+                tvProximityCount.setText(getString(R.string.proximity_slider_taps, String.valueOf(arg1)));
             }
         });
         int proximityCount = mSettings.getInt(ProximityTrigger.KEY_PROXIMITY_COUNT, 3);
@@ -178,7 +178,7 @@ public void onStartTrackingTouch(SeekBar arg0) {
 
             @Override
             public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
-                tvProximityTimeout.setText(getString(R.string.proximity_slider_timeout, arg1));
+                tvProximityTimeout.setText(getString(R.string.proximity_slider_timeout, String.valueOf(arg1)));
             }
         });
         int proximityTimeout = mSettings.getInt(ProximityTrigger.KEY_PROXIMITY_TIMEOUT, 500);
@@ -259,9 +259,9 @@ private void switchLayout(boolean recorder) {
             layoutConfigParent.setVisibility(View.GONE);
             layoutRunningParent.setVisibility(View.VISIBLE);
             if (mBinder != null && mBinder.isRecording()) {
-                recorderToggleButton.setText("Stop recording");
+                recorderToggleButton.setText(R.string.action_stop_recording);
             } else {
-                recorderToggleButton.setText("Start recording");
+                recorderToggleButton.setText(R.string.action_start_recording);
             }
         } else {
             layoutConfigParent.setEnabled(true);
diff --git a/app/src/main/java/eu/thedarken/audiobug/FollowMeDialogFragment.java b/app/src/main/java/eu/thedarken/audiobug/FollowMeDialogFragment.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/eu/thedarken/audiobug/InfoDialogFragment.java b/app/src/main/java/eu/thedarken/audiobug/InfoDialogFragment.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/eu/thedarken/audiobug/MainActivity.java b/app/src/main/java/eu/thedarken/audiobug/MainActivity.java
old mode 100644
new mode 100755
index f9c0ad2..3b844dd
--- a/app/src/main/java/eu/thedarken/audiobug/MainActivity.java
+++ b/app/src/main/java/eu/thedarken/audiobug/MainActivity.java
@@ -8,7 +8,6 @@
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/eu/thedarken/audiobug/PreferencesActivity.java b/app/src/main/java/eu/thedarken/audiobug/PreferencesActivity.java
old mode 100644
new mode 100755
index 45dcd4b..a15181d
--- a/app/src/main/java/eu/thedarken/audiobug/PreferencesActivity.java
+++ b/app/src/main/java/eu/thedarken/audiobug/PreferencesActivity.java
@@ -25,10 +25,11 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference.getKey().equals("misc.github")) {
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/d4rken/audiobug"));
-            startActivity(browserIntent);
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/d4rken/audiobug")));
             return true;
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
+        } else if (preference.getKey().equals("misc.privacy")) {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/d4rken/audiobug/blob/master/privacy_policy_for_gplay.md")));
+            return true;
+        } else return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 }
diff --git a/app/src/main/java/eu/thedarken/audiobug/RecorderWidget.java b/app/src/main/java/eu/thedarken/audiobug/RecorderWidget.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/eu/thedarken/audiobug/trigger/ProximityTrigger.java b/app/src/main/java/eu/thedarken/audiobug/trigger/ProximityTrigger.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/eu/thedarken/audiobug/trigger/ShakeTrigger.java b/app/src/main/java/eu/thedarken/audiobug/trigger/ShakeTrigger.java
old mode 100644
new mode 100755
diff --git a/app/src/main/java/eu/thedarken/audiobug/trigger/Trigger.java b/app/src/main/java/eu/thedarken/audiobug/trigger/Trigger.java
old mode 100644
new mode 100755
index 432ba20..ca15f0f
--- a/app/src/main/java/eu/thedarken/audiobug/trigger/Trigger.java
+++ b/app/src/main/java/eu/thedarken/audiobug/trigger/Trigger.java
@@ -11,7 +11,7 @@ public enum TYPE {
         NONE, SHAKE, PROXIMITY
     }
 
-    public Trigger(Context context, TriggerListener mListener) {
+    Trigger(Context context, TriggerListener mListener) {
         this.mContext = context;
         this.mListener = mListener;
     }
@@ -20,17 +20,17 @@ public Trigger(Context context, TriggerListener mListener) {
 
     public abstract void stop();
 
-    public TriggerListener getListener() {
+    TriggerListener getListener() {
         return mListener;
     }
 
-    protected Context getContext() {
+    Context getContext() {
         return mContext;
     }
 
 
     public interface TriggerListener {
-        public void onTriggered();
+        void onTriggered();
     }
 
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_action_github.png b/app/src/main/res/drawable-hdpi/ic_action_github.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-hdpi/ic_action_playback_play.png b/app/src/main/res/drawable-hdpi/ic_action_playback_play.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-hdpi/ic_action_playback_stop.png b/app/src/main/res/drawable-hdpi/ic_action_playback_stop.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-hdpi/ic_action_twitter.png b/app/src/main/res/drawable-hdpi/ic_action_twitter.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_action_github.png b/app/src/main/res/drawable-mdpi/ic_action_github.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_action_playback_play.png b/app/src/main/res/drawable-mdpi/ic_action_playback_play.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_action_playback_stop.png b/app/src/main/res/drawable-mdpi/ic_action_playback_stop.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_action_record.png b/app/src/main/res/drawable-mdpi/ic_action_record.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_action_twitter.png b/app/src/main/res/drawable-mdpi/ic_action_twitter.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_github.png b/app/src/main/res/drawable-xhdpi/ic_action_github.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_playback_play.png b/app/src/main/res/drawable-xhdpi/ic_action_playback_play.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_playback_stop.png b/app/src/main/res/drawable-xhdpi/ic_action_playback_stop.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_twitter.png b/app/src/main/res/drawable-xhdpi/ic_action_twitter.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_github.png b/app/src/main/res/drawable-xxhdpi/ic_action_github.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_playback_play.png b/app/src/main/res/drawable-xxhdpi/ic_action_playback_play.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_playback_stop.png b/app/src/main/res/drawable-xxhdpi/ic_action_playback_stop.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_record.png b/app/src/main/res/drawable-xxhdpi/ic_action_record.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_twitter.png b/app/src/main/res/drawable-xxhdpi/ic_action_twitter.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/widgetnorm.png b/app/src/main/res/drawable/widgetnorm.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/widgetpressed.png b/app/src/main/res/drawable/widgetpressed.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/widgetrec.png b/app/src/main/res/drawable/widgetrec.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/configuration_fragment_layout.xml b/app/src/main/res/layout/configuration_fragment_layout.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/main_activity_layout.xml b/app/src/main/res/layout/main_activity_layout.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/widget_layout.xml b/app/src/main/res/layout/widget_layout.xml
old mode 100644
new mode 100755
index ba23908..569a634
--- a/app/src/main/res/layout/widget_layout.xml
+++ b/app/src/main/res/layout/widget_layout.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
     <ImageButton
         android:id="@+id/ib_widgetbutton"
@@ -11,5 +12,5 @@
         android:background="@android:color/transparent"
         android:src="@xml/widgetbutton"
         android:clickable="true"
-        android:text="" />
+        tools:ignore="ContentDescription"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/menu/service_menu.xml b/app/src/main/res/menu/service_menu.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
index b4df353..4043ec7
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,4 +29,8 @@
     <string name="start_recording">Start recording</string>
     <string name="stop_to_config">Stop the service to make configuration changes.</string>
     <string name="info">Info</string>
+    <string name="privacy_summary">This app does not collect or share any user data.</string>
+    <string name="privacy_title">Privacy Policy</string>
+    <string name="action_stop_recording">Stop recording</string>
+    <string name="action_start_recording">Start recording</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
old mode 100644
new mode 100755
index caffb96..f724414
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -31,6 +31,10 @@
             android:key="misc.github"
             android:summary="@string/open_source_summary"
             android:title="@string/sourcecode" />
+        <PreferenceScreen
+            android:key="misc.privacy"
+            android:summary="@string/privacy_summary"
+            android:title="@string/privacy_title"/>
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/widgetbutton.xml b/app/src/main/res/xml/widgetbutton.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/xml/widgetinfo.xml b/app/src/main/res/xml/widgetinfo.xml
old mode 100644
new mode 100755
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
index 80eec1a..6949ce9
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,10 @@
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
index 5de946b..c470e2f
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Sat Feb 18 17:39:53 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
old mode 100644
new mode 100755