summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-06-11 19:01:36 +0200
committerParménides GV <parmegv@sdf.org>2013-06-11 19:26:16 +0200
commit6c90e0043ec68254c15562fd12a707f5e45f47e7 (patch)
tree70ff565759886c7a611e89530839db923bd4a423
parent1e2470b1e940877f6fe247a65bccd2b62b621eb6 (diff)
We are not using SD storage anymore.
We were using it to save certificate and provider.json files from chosen provider, so that exporting them was easily done. We don't need that files, because if we wanted to export that files we would be able to recover them easily and updated. This fixes #2783
-rw-r--r--AndroidManifest.xml5
-rw-r--r--src/se/leap/leapclient/ConfigHelper.java20
-rw-r--r--src/se/leap/leapclient/ProviderAPI.java2
3 files changed, 1 insertions, 26 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 56ca7d4..68a1ef1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,10 +22,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
@@ -158,4 +155,4 @@
</activity>
</application>
-</manifest> \ No newline at end of file
+</manifest>
diff --git a/src/se/leap/leapclient/ConfigHelper.java b/src/se/leap/leapclient/ConfigHelper.java
index e8bc27c..11f9504 100644
--- a/src/se/leap/leapclient/ConfigHelper.java
+++ b/src/se/leap/leapclient/ConfigHelper.java
@@ -156,26 +156,6 @@ public class ConfigHelper {
return value;
}
- public static void saveFile(String filename, String content) {
- File root = Environment.getExternalStorageDirectory();
- File leap_dir = new File(root.getAbsolutePath() + File.separator + USER_DIRECTORY);
- if (!leap_dir.isDirectory()) {
- leap_dir.mkdir();
- }
- try {
- if (!leap_dir.isDirectory()) {
- throw new IOException(
- "Unable to create directory " + USER_DIRECTORY + ". Maybe the SD card is mounted?");
- }
- File outputFile = new File(leap_dir, filename);
- BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile));
- writer.write(content);
- writer.close();
- } catch (IOException e) {
- Log.w("leap_android", e.getMessage(), e);
- }
- }
-
public static FileInputStream openFileInputStream(String filename) {
FileInputStream input_stream = null;
File root = Environment.getExternalStorageDirectory();
diff --git a/src/se/leap/leapclient/ProviderAPI.java b/src/se/leap/leapclient/ProviderAPI.java
index 0898ebb..10f04c5 100644
--- a/src/se/leap/leapclient/ProviderAPI.java
+++ b/src/se/leap/leapclient/ProviderAPI.java
@@ -217,7 +217,6 @@ public class ProviderAPI extends IntentService {
ConfigHelper.saveSharedPref(ConfigHelper.ALLOWED_ANON, provider_json.getJSONObject(ConfigHelper.SERVICE_KEY).getBoolean(ConfigHelper.ALLOWED_ANON));
String filename = provider_name + "_provider.json".replaceFirst("__", "_");
- ConfigHelper.saveFile(filename, provider_json.toString());
ProviderListContent.addItem(new ProviderItem(provider_name, provider_json_url, filename, custom, danger_on));
result.putBoolean(ConfigHelper.RESULT_KEY, true);
@@ -243,7 +242,6 @@ public class ProviderAPI extends IntentService {
provider_json = getJSONFromProvider(provider_json_url, danger_on);
String filename = provider_name + "_provider.json".replaceFirst("__", "_");
- ConfigHelper.saveFile(filename, provider_json.toString());
ProviderListContent.addItem(new ProviderItem(provider_name, provider_json_url, filename, custom, danger_on));
return true;