Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Zip the sent logs so that it is harder to hit the intent storage limit (about 1MB).

Browse source 
We store the zip file in the external access, always in the same file, so it should not add too much storage.
This commit is contained in:
Guillaume BIENKOWSKI 2014-07-01 14:11:35 +02:00
parent bf8b533687
commit d5390388d3
1 changed files with 45 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/org/linphone/LinphoneUtils.java
View file

@ -21,7 +21,10 @@ package org.linphone;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import java.io.BufferedOutputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -31,6 +34,8 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall;
@ -340,7 +345,28 @@ public final class LinphoneUtils {
e.printStackTrace(); e.printStackTrace();
} }
} }
public static boolean zipLogs(StringBuilder sb, String toZipFile){
boolean success = false;
try {
FileOutputStream zip = new FileOutputStream(toZipFile);
ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(zip));
ZipEntry entry = new ZipEntry("logs.txt");
out.putNextEntry(entry);
out.write(sb.toString().getBytes());
out.close();
success = true;
} catch (Exception e){
Log.e("Exception when trying to zip the logs: " + e.getMessage());
}
return success;
}
public static void collectLogs(Context context, String email) { public static void collectLogs(Context context, String email) {
BufferedReader br = null; BufferedReader br = null;
Process p = null; Process p = null;
@ -355,16 +381,24 @@ public final class LinphoneUtils {
sb.append(line); sb.append(line);
sb.append("\r\n"); sb.append("\r\n");
} }
String zipFilePath = context.getExternalFilesDir(null).getAbsolutePath() + "/logs.zip";
Intent i = new Intent(Intent.ACTION_SEND); Log.i("Saving logs to " + zipFilePath);
i.setType("message/rfc822");
i.putExtra(Intent.EXTRA_EMAIL, new String[]{email}); if( zipLogs(sb, zipFilePath) ) {
i.putExtra(Intent.EXTRA_SUBJECT, "Linphone Logs"); Uri zipURI = Uri.parse("file://" + zipFilePath);
i.putExtra(Intent.EXTRA_TEXT, sb.toString()); Intent i = new Intent(Intent.ACTION_SEND);
try { i.putExtra(Intent.EXTRA_EMAIL, new String[]{email});
context.startActivity(Intent.createChooser(i, "Send mail...")); i.putExtra(Intent.EXTRA_SUBJECT, "Linphone Logs");
} catch (android.content.ActivityNotFoundException ex) { i.putExtra(Intent.EXTRA_TEXT, "Linphone logs");
} i.setType("application/zip");
i.putExtra(Intent.EXTRA_STREAM, zipURI);
try {
context.startActivity(Intent.createChooser(i, "Send mail..."));
} catch (android.content.ActivityNotFoundException ex) {
}
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }