From 0d852b5043d04fd7c70aa337d7eade92297f5315 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Wed, 22 Jan 2014 16:15:54 +0100 Subject: [PATCH] got rid of iitc source setting * the developer mode makes it pretty much useless * it's broken since the new fileManager was introduced. nobody complained that it doesn't work -> nobody uses this feature. --- mobile/res/values/strings.xml | 2 -- mobile/res/xml/preferences.xml | 7 ---- .../cradle/iitc_mobile/IITC_FileManager.java | 22 ------------- .../iitc_mobile/async/UrlContentToString.java | 32 ------------------- .../iitc_mobile/fragments/MainSettings.java | 14 -------- 5 files changed, 77 deletions(-) delete mode 100644 mobile/src/com/cradle/iitc_mobile/async/UrlContentToString.java diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml index 942c186d..16f5500d 100644 --- a/mobile/res/values/strings.xml +++ b/mobile/res/values/strings.xml @@ -121,8 +121,6 @@ Fake User Agent Let IITCm appear as a desktop browser for the intel site. Note: If just want to use the desktop mode use the \'force desktop mode\' setting - IITC source - Load IITC main script from url or use local script. Currently used source: System Bar diff --git a/mobile/res/xml/preferences.xml b/mobile/res/xml/preferences.xml index aabe316c..1244770c 100644 --- a/mobile/res/xml/preferences.xml +++ b/mobile/res/xml/preferences.xml @@ -71,13 +71,6 @@ android:key="pref_dev_checkbox" android:summary="@string/pref_enable_dev_mode_sum" android:title="@string/pref_enable_dev_mode"/> - - - - diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java index d20a4f84..6fe49f1c 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_FileManager.java @@ -27,7 +27,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; -import java.net.URL; import java.net.URLEncoder; import java.util.HashMap; @@ -155,27 +154,6 @@ public class IITC_FileManager { } } - final String source = mPrefs.getString("pref_iitc_source", "local"); - if (!source.equals("local")) { - // load iitc script from web or asset folder - if (source.contains("http")) { - try { - final URL context = new URL(source); - final URL url = new URL(context, filename); - return url.openStream(); - } catch (final IOException e) { - Log.w(e); - } - } else { - final File file = new File(source + File.separatorChar + filename); - try { - return new FileInputStream(file); - } catch (final FileNotFoundException e) { - Log.w(e); - } - } - } - // load plugins from asset folder return mAssetManager.open(filename); } diff --git a/mobile/src/com/cradle/iitc_mobile/async/UrlContentToString.java b/mobile/src/com/cradle/iitc_mobile/async/UrlContentToString.java deleted file mode 100644 index 539378d9..00000000 --- a/mobile/src/com/cradle/iitc_mobile/async/UrlContentToString.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cradle.iitc_mobile.async; - -import android.os.AsyncTask; - -import com.cradle.iitc_mobile.IITC_FileManager; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.net.URL; - -/* - * this class parses the content of a web page. - * since network operations shouldn't be done on main UI thread - * (NetworkOnMainThread exception is thrown) we use an async task for this. - */ -public class UrlContentToString extends AsyncTask { - - @Override - protected String doInBackground(URL... urls) { - String js = ""; - URL url = urls[0]; - try { - FileInputStream is = new FileInputStream(new File(url.getPath())); - js = IITC_FileManager.readStream(is); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - return js; - } - -} diff --git a/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java b/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java index e9e6d7dd..79a46ef6 100644 --- a/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java +++ b/mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java @@ -44,20 +44,6 @@ public class MainSettings extends PreferenceFragment { IITC_AboutDialogPreference pref_about = (IITC_AboutDialogPreference) findPreference("pref_about"); pref_about.setVersions(iitcVersion, buildVersion); - // set iitc source - EditTextPreference pref_iitc_source = (EditTextPreference) findPreference("pref_iitc_source"); - pref_iitc_source.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - preference.setSummary(getString(R.string.pref_select_iitc_sum) + " " + newValue); - // TODO: update mIitcVersion when iitc source has changed - return true; - } - }); - // first init of summary - String pref_iitc_source_sum = getString(R.string.pref_select_iitc_sum) + " " + pref_iitc_source.getText(); - pref_iitc_source.setSummary(pref_iitc_source_sum); - final ListPreference pref_user_location_mode = (ListPreference) findPreference("pref_user_location_mode"); pref_user_location_mode.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override