1 files changed, 35 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 07c328b9a..750a74212 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -3,8 +3,10 @@ package eu.siacs.conversations.ui;
 import android.app.AlertDialog;
 import android.app.FragmentManager;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -19,16 +21,20 @@ import java.security.KeyStoreException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 
 import de.duenndns.ssl.MemorizingTrustManager;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.services.ExportLogsService;
 import eu.siacs.conversations.xmpp.XmppConnection;
 
 public class SettingsActivity extends XmppActivity implements
 		OnSharedPreferenceChangeListener {
+
+	public static final int REQUEST_WRITE_LOGS = 0xbf8701;
 	private SettingsFragment mSettingsFragment;
 
 	@Override
@@ -130,6 +136,15 @@ public class SettingsActivity extends XmppActivity implements
 				return true;
 			}
 		});
+
+		final Preference exportLogsPreference = mSettingsFragment.findPreference("export_logs");
+		exportLogsPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+			@Override
+			public boolean onPreferenceClick(Preference preference) {
+				hasStoragePermission(REQUEST_WRITE_LOGS);
+				return true;
+			}
+		});
 	}
 
 	@Override
@@ -140,8 +155,13 @@ public class SettingsActivity extends XmppActivity implements
 	}
 
 	@Override
-	public void onSharedPreferenceChanged(SharedPreferences preferences,
-			String name) {
+	public void onSharedPreferenceChanged(SharedPreferences preferences, String name) {
+		final List<String> resendPresence = Arrays.asList(
+				"confirm_messages",
+				"xa_on_silent_mode",
+				"away_when_screen_off",
+				"allow_message_correction",
+				"treat_vibrate_as_silent");
 		if (name.equals("resource")) {
 			String resource = preferences.getString("resource", "mobile")
 					.toLowerCase(Locale.US);
@@ -160,10 +180,7 @@ public class SettingsActivity extends XmppActivity implements
 			}
 		} else if (name.equals("keep_foreground_service")) {
 			xmppConnectionService.toggleForegroundService();
-		} else if (name.equals("confirm_messages")
-				|| name.equals("xa_on_silent_mode")
-				|| name.equals("away_when_screen_off")
-				|| name.equals("allow_message_correction")) {
+		} else if (resendPresence.contains(name)) {
 			if (xmppConnectionServiceBound) {
 				if (name.equals("away_when_screen_off")) {
 					xmppConnectionService.toggleScreenEventReceiver();
@@ -179,6 +196,18 @@ public class SettingsActivity extends XmppActivity implements
 
 	}
 
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+		if (grantResults.length > 0)
+			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+				if (requestCode == REQUEST_WRITE_LOGS) {
+					getApplicationContext().startService(new Intent(getApplicationContext(), ExportLogsService.class));
+				}
+			} else {
+				Toast.makeText(this, R.string.no_storage_permission, Toast.LENGTH_SHORT).show();
+			}
+	}
+
 	private void displayToast(final String msg) {
 		runOnUiThread(new Runnable() {
 			@Override