From 3eecb2f3796c160f6cf050a5d1589fa9df8c7343 Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Mon, 18 Jun 2018 14:40:14 -0300 Subject: [PATCH] Apply code conventions --- .../BreakpadUploaderService.java | 44 +++++++++---------- interface/src/CrashHandler_Breakpad.cpp | 2 +- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/BreakpadUploaderService.java b/android/app/src/main/java/io/highfidelity/hifiinterface/BreakpadUploaderService.java index a90a12b86b..89b7bf451e 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/BreakpadUploaderService.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/BreakpadUploaderService.java @@ -54,8 +54,7 @@ public class BreakpadUploaderService extends Service { new Thread(() -> { File[] matchingFiles = getFilesByExtension(getObbDir(), EXT_DMP); - for (File file : matchingFiles) - { + for (File file : matchingFiles) { uploadDumpAndDelete(file, baseUrl); } }).start(); @@ -98,25 +97,25 @@ public class BreakpadUploaderService extends Service { int size = (int) file.length(); byte[] bytes = new byte[size]; try { - BufferedInputStream buf = new BufferedInputStream(new FileInputStream(file)); - buf.read(bytes, 0, bytes.length); - buf.close(); - HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); - urlConnection.setRequestMethod("POST"); - urlConnection.setDoOutput(true); - urlConnection.setChunkedStreamingMode(0); + BufferedInputStream buf = new BufferedInputStream(new FileInputStream(file)); + buf.read(bytes, 0, bytes.length); + buf.close(); + HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); + urlConnection.setRequestMethod("POST"); + urlConnection.setDoOutput(true); + urlConnection.setChunkedStreamingMode(0); - OutputStream ostream = urlConnection.getOutputStream(); + OutputStream ostream = urlConnection.getOutputStream(); - OutputStream out = new BufferedOutputStream(ostream); - out.write(bytes, 0, size); + OutputStream out = new BufferedOutputStream(ostream); + out.write(bytes, 0, size); - InputStream in = new BufferedInputStream(urlConnection.getInputStream()); - in.read(); - if (urlConnection.getResponseCode() == 200) { - file.delete(); - } - urlConnection.disconnect(); + InputStream in = new BufferedInputStream(urlConnection.getInputStream()); + in.read(); + if (urlConnection.getResponseCode() == 200) { + file.delete(); + } + urlConnection.disconnect(); } catch (IOException e) { Log.e(TAG, "Error uploading file " + file.getAbsolutePath(), e); } @@ -128,20 +127,17 @@ public class BreakpadUploaderService extends Service { 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)); } - private String getExtension(String fileName) - { + private String getExtension(String fileName) { String extension = ""; int i = fileName.lastIndexOf('.'); int p = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\')); - if (i > p) - { + if (i > p) { extension = fileName.substring(i+1); } diff --git a/interface/src/CrashHandler_Breakpad.cpp b/interface/src/CrashHandler_Breakpad.cpp index ffc49c4ec4..fe4979853e 100644 --- a/interface/src/CrashHandler_Breakpad.cpp +++ b/interface/src/CrashHandler_Breakpad.cpp @@ -60,7 +60,7 @@ void setCrashAnnotation(std::string name, std::string value) { QSettings settings(obbDir() + "/annotations.json", JSON_FORMAT); settings.clear(); settings.beginGroup("Annotations"); - for(auto k : annotations.keys()) { + for (auto k : annotations.keys()) { settings.setValue(k, annotations.value(k)); } settings.endGroup();