From f0ee101ba49e2810aa4017fb9ea1f273de7de283 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 10 Feb 2015 11:15:24 +0100
Subject: [PATCH] remove dump_logcat (use log console instead)

---
 vlc-android/res/xml/preferences.xml           |  7 +---
 .../videolan/vlc/gui/PreferencesActivity.java | 32 -------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/vlc-android/res/xml/preferences.xml b/vlc-android/res/xml/preferences.xml
index 4aec0ac69..17c631001 100644
--- a/vlc-android/res/xml/preferences.xml
+++ b/vlc-android/res/xml/preferences.xml
@@ -164,13 +164,8 @@
                 <PreferenceScreen
                     android:key="debug_logs"
                     android:title="@string/debug_logs" />
-
-                <Preference
-                    android:enabled="true"
-                    android:key="dump_logcat"
-                    android:title="@string/dump_logcat" />
             </PreferenceCategory>
         </PreferenceScreen>
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
index 88e4970e9..7bcf379cf 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PreferencesActivity.java
@@ -204,38 +204,6 @@ public class PreferencesActivity extends PreferenceActivity implements OnSharedP
                     }
                 });
 
-        Preference dumpLogcatLog = findPreference("dump_logcat");
-        dumpLogcatLog.setOnPreferenceClickListener(
-                new OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        if(!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                            Toast.makeText(PreferencesActivity.this,
-                                    R.string.dump_logcat_failure,
-                                    Toast.LENGTH_LONG).show();
-                            return true;
-                        }
-
-                        CharSequence timestamp = DateFormat.format(
-                                "yyyyMMdd_kkmmss", System.currentTimeMillis());
-                        String filename = Environment.getExternalStorageDirectory().getPath() + "/vlc_logcat_" + timestamp + ".log";
-                        try {
-                            Logcat.writeLogcat(filename);
-                            Toast.makeText(
-                                    PreferencesActivity.this,
-                                    String.format(
-                                            VLCApplication.getAppResources().getString(R.string.dump_logcat_success),
-                                            filename), Toast.LENGTH_LONG)
-                                    .show();
-                        } catch (Exception e) {
-                            Toast.makeText(PreferencesActivity.this,
-                                    R.string.dump_logcat_failure,
-                                    Toast.LENGTH_LONG).show();
-                        }
-                        return true;
-                    }
-                });
-
         // Audio output
         ListPreference aoutPref = (ListPreference) findPreference("aout");
         if (LibVlcUtil.isICSOrLater()) {
-- 
GitLab