Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:30:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply code conventions

Browse source
This commit is contained in:
Gabriel Calero 2018-06-18 14:40:14 -03:00
parent 583c46b3a0
commit 3eecb2f379
2 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
android/app/src/main/java/io/highfidelity/hifiinterface/BreakpadUploaderService.java
View file

@ -54,8 +54,7 @@ public class BreakpadUploaderService extends Service {
new Thread(() -> { new Thread(() -> {
File[] matchingFiles = getFilesByExtension(getObbDir(), EXT_DMP); File[] matchingFiles = getFilesByExtension(getObbDir(), EXT_DMP);
for (File file : matchingFiles) for (File file : matchingFiles) {
{
uploadDumpAndDelete(file, baseUrl); uploadDumpAndDelete(file, baseUrl);
} }
}).start(); }).start();
@ -98,25 +97,25 @@ public class BreakpadUploaderService extends Service {
int size = (int) file.length(); int size = (int) file.length();
byte[] bytes = new byte[size]; byte[] bytes = new byte[size];
try { try {
BufferedInputStream buf = new BufferedInputStream(new FileInputStream(file)); BufferedInputStream buf = new BufferedInputStream(new FileInputStream(file));
buf.read(bytes, 0, bytes.length); buf.read(bytes, 0, bytes.length);
buf.close(); buf.close();
HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection();
urlConnection.setRequestMethod("POST"); urlConnection.setRequestMethod("POST");
urlConnection.setDoOutput(true); urlConnection.setDoOutput(true);
urlConnection.setChunkedStreamingMode(0); urlConnection.setChunkedStreamingMode(0);
OutputStream ostream = urlConnection.getOutputStream(); OutputStream ostream = urlConnection.getOutputStream();
OutputStream out = new BufferedOutputStream(ostream); OutputStream out = new BufferedOutputStream(ostream);
out.write(bytes, 0, size); out.write(bytes, 0, size);
InputStream in = new BufferedInputStream(urlConnection.getInputStream()); InputStream in = new BufferedInputStream(urlConnection.getInputStream());
in.read(); in.read();
if (urlConnection.getResponseCode() == 200) { if (urlConnection.getResponseCode() == 200) {
file.delete(); file.delete();
} }
urlConnection.disconnect(); urlConnection.disconnect();
} catch (IOException e) { } catch (IOException e) {
Log.e(TAG, "Error uploading file " + file.getAbsolutePath(), e); Log.e(TAG, "Error uploading file " + file.getAbsolutePath(), e);
} }
@ -128,20 +127,17 @@ public class BreakpadUploaderService extends Service {
return null; return null;
} }
private File[] getFilesByExtension(File dir, final String extension) private File[] getFilesByExtension(File dir, final String extension) {
{
return dir.listFiles(pathName -> getExtension(pathName.getName()).equals(extension)); return dir.listFiles(pathName -> getExtension(pathName.getName()).equals(extension));
} }
private String getExtension(String fileName) private String getExtension(String fileName) {
{
String extension = ""; String extension = "";
int i = fileName.lastIndexOf('.'); int i = fileName.lastIndexOf('.');
int p = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\')); int p = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\'));
if (i > p) if (i > p) {
{
extension = fileName.substring(i+1); extension = fileName.substring(i+1);
} }

2
interface/src/CrashHandler_Breakpad.cpp
View file

@ -60,7 +60,7 @@ void setCrashAnnotation(std::string name, std::string value) {
QSettings settings(obbDir() + "/annotations.json", JSON_FORMAT); QSettings settings(obbDir() + "/annotations.json", JSON_FORMAT);
settings.clear(); settings.clear();
settings.beginGroup("Annotations"); settings.beginGroup("Annotations");
for(auto k : annotations.keys()) { for (auto k : annotations.keys()) {
settings.setValue(k, annotations.value(k)); settings.setValue(k, annotations.value(k));
} }
settings.endGroup(); settings.endGroup();