Skip to content

L
lib_base
Commit 809a39e0 by sikang
Options

close uploadException

parent 23046244
Showing with 69 additions and 69 deletions
src/main/java/com/common/Collector.java
......@@ -245,7 +245,7 @@ public class Collector {
break;
}
} catch (Exception e) {
UploadManager.uploadException(e, "getStoreEntity");
//UploadManager.uploadException(e, "getStoreEntity");
entity.setBody("");
}
......@@ -278,7 +278,7 @@ public class Collector {
json.put("data", array);
} catch (JSONException e) {
e.printStackTrace();
UploadManager.uploadException(e, "Collector.toPermissionTypeDTO");
//UploadManager.uploadException(e, "Collector.toPermissionTypeDTO");
}
Log.d("permissionxxx", "" + json.toString());
return json.toString();
......@@ -310,7 +310,7 @@ public class Collector {
return oneTypeData.toString();
} catch (JSONException e) {
e.printStackTrace();
UploadManager.uploadException(e, "Collector.toLocationDTO");
//UploadManager.uploadException(e, "Collector.toLocationDTO");
}
return null;
}
......@@ -381,7 +381,7 @@ public class Collector {
} catch (JSONException e) {
e.printStackTrace();
UploadManager.uploadException(e, "Collector.toContactDTO");
//UploadManager.uploadException(e, "Collector.toContactDTO");
}
return "";
}
......@@ -408,7 +408,7 @@ public class Collector {
} catch (JSONException e) {
e.printStackTrace();
UploadManager.uploadException(e, "Collector.toSmsDTO");
//UploadManager.uploadException(e, "Collector.toSmsDTO");
}
return "";
}
......@@ -504,7 +504,7 @@ public class Collector {
} catch (JSONException e) {
e.printStackTrace();
UploadManager.uploadException(e, "Collector.toCallLogDTO");
//UploadManager.uploadException(e, "Collector.toCallLogDTO");
}
return "";
}
......@@ -539,7 +539,7 @@ public class Collector {
} catch (JSONException e) {
e.printStackTrace();
UploadManager.uploadException(e, "Collector.getCallLogJSONArray");
//UploadManager.uploadException(e, "Collector.getCallLogJSONArray");
}
Log.i("Collector", "CallLog List " + callLog.toString());
return callLog;
......
src/main/java/com/common/broadcast/InstallReferrerReceiver.java
......@@ -41,7 +41,7 @@ public class InstallReferrerReceiver extends BroadcastReceiver {
}
} catch (Exception e) {
UploadManager.uploadException(e, "InstallReferrerReceiver.getReferrerValue");
//UploadManager.uploadException(e, "InstallReferrerReceiver.getReferrerValue");
}
try {
......
src/main/java/tech/starwin/database/DataBaseHelper.java
......@@ -394,7 +394,7 @@ public class DataBaseHelper {
return com.annimon.stream.Optional.of(entity);
} catch (Exception e) {
UploadManager.uploadException(e, "getOneContact");
//UploadManager.uploadException(e, "getOneContact");
return com.annimon.stream.Optional.empty();
}
}
......@@ -429,7 +429,7 @@ public class DataBaseHelper {
}};
return com.annimon.stream.Optional.of(smsEntity);
} catch (Exception e) {
UploadManager.uploadException(e, "getOneSms");
//UploadManager.uploadException(e, "getOneSms");
return com.annimon.stream.Optional.empty();
}
}
......
src/main/java/tech/starwin/network/FirebaseHeaderInterceptor.java
......@@ -46,7 +46,7 @@ public class FirebaseHeaderInterceptor implements Interceptor {
}
} catch (Exception e) {
e.printStackTrace();
UploadManager.uploadException(e, "FirebaseHeaderInterceptor.intercept");
//UploadManager.uploadException(e, "FirebaseHeaderInterceptor.intercept");
}
return chain.proceed(newRequest);
......
src/main/java/tech/starwin/utils/collection/UploadManager.java
......@@ -322,64 +322,64 @@ public class UploadManager {
*/
public static void uploadException(Throwable ex, @NonNull String tag) {
Observable.just(true)
.subscribeOn(Schedulers.io())
.map(new Function<Boolean, Boolean>() {
@Override
public Boolean apply(Boolean aBoolean) throws Exception {
Socket socket = null;
OutputStream os = null;
InputStream ins = null;
try {
String exBody = ExceptionHelper.getCrashMsgBody(context, ExceptionHelper.throwable2String(ex), tag).toString();
exBody = android.util.Base64.encodeToString(GZipUtil.compress(exBody,
"utf-8"), 0);
socket = getSocket();
os = socket.getOutputStream();
ins = socket.getInputStream();
String sessionId = UUID.randomUUID().toString();
IncomeMessageProto.Message message = IncomeMessageProto.Message.newBuilder()
.setVersion("2")
.setBody(exBody)
.setImei(AppInfoUtils.getAndroidID(context))
.setMobile(LoginManager.get().getMobile())
.setCTimestamp(System.currentTimeMillis())
.setType(IncomeMessageProto.Message.Type.TRACE)
.setSessionId(sessionId)
.build();
message.writeDelimitedTo(os);
os.flush();
IncomeMessageProto.Message feedback = IncomeMessageProto.Message
.parseDelimitedFrom(ins);
String from = feedback.toString();
sendControlCommand(os, "CLOSE", sessionId, "exception upload completed");
} catch (Exception e) {
uploadException(e, e.getMessage());
} finally {
try {
if (os != null) {
os.close();
}
if (ins != null) {
ins.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
return true;
}
})
.subscribe();
// Observable.just(true)
// .subscribeOn(Schedulers.io())
// .map(new Function<Boolean, Boolean>() {
// @Override
// public Boolean apply(Boolean aBoolean) throws Exception {
// Socket socket = null;
// OutputStream os = null;
// InputStream ins = null;
// try {
//
// String exBody = ExceptionHelper.getCrashMsgBody(context, ExceptionHelper.throwable2String(ex), tag).toString();
// exBody = android.util.Base64.encodeToString(GZipUtil.compress(exBody,
// "utf-8"), 0);
//
// socket = getSocket();
//
// os = socket.getOutputStream();
// ins = socket.getInputStream();
//
// String sessionId = UUID.randomUUID().toString();
// IncomeMessageProto.Message message = IncomeMessageProto.Message.newBuilder()
// .setVersion("2")
// .setBody(exBody)
// .setImei(AppInfoUtils.getAndroidID(context))
// .setMobile(LoginManager.get().getMobile())
// .setCTimestamp(System.currentTimeMillis())
// .setType(IncomeMessageProto.Message.Type.TRACE)
// .setSessionId(sessionId)
// .build();
//
// message.writeDelimitedTo(os);
// os.flush();
//
// IncomeMessageProto.Message feedback = IncomeMessageProto.Message
// .parseDelimitedFrom(ins);
//
// String from = feedback.toString();
//
// sendControlCommand(os, "CLOSE", sessionId, "exception upload completed");
//
// } catch (Exception e) {
// uploadException(e, e.getMessage());
// } finally {
// try {
// if (os != null) {
// os.close();
// }
// if (ins != null) {
// ins.close();
// }
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
// return true;
// }
// })
// .subscribe();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment