去掉ryc的errorreporter

chengzhenyu лет %!s(int64=6): %!d(string=назад)
Родитель
Сommit
d99cc55182

+ 0 - 1
app/build.gradle

@@ -18,5 +18,4 @@ android {
18 18
 }
19 19
 
20 20
 dependencies {
21
-    compile files('libs/acra-4.2.3.jar')
22 21
 }

BIN
app/libs/acra-4.2.3.jar


+ 13 - 22
app/src/main/java/com/remoteyourcam/usb/ptp/PtpCamera.java

@@ -15,26 +15,11 @@
15 15
  */
16 16
 package com.remoteyourcam.usb.ptp;
17 17
 
18
-import java.io.File;
19
-import java.io.FileWriter;
20
-import java.io.IOException;
21
-import java.nio.ByteBuffer;
22
-import java.nio.ByteOrder;
23
-import java.util.Arrays;
24
-import java.util.HashMap;
25
-import java.util.HashSet;
26
-import java.util.Map;
27
-import java.util.Set;
28
-import java.util.concurrent.LinkedBlockingQueue;
29
-import java.util.concurrent.TimeUnit;
30
-
31 18
 import android.graphics.Bitmap;
32 19
 import android.hardware.usb.UsbRequest;
33 20
 import android.os.Handler;
34 21
 import android.util.Log;
35 22
 
36
-import org.acra.ErrorReporter;
37
-
38 23
 import com.remoteyourcam.usb.AppConfig;
39 24
 import com.remoteyourcam.usb.ptp.commands.CloseSessionCommand;
40 25
 import com.remoteyourcam.usb.ptp.commands.Command;
@@ -52,6 +37,19 @@ import com.remoteyourcam.usb.ptp.model.DeviceInfo;
52 37
 import com.remoteyourcam.usb.ptp.model.DevicePropDesc;
53 38
 import com.remoteyourcam.usb.ptp.model.LiveViewData;
54 39
 
40
+import java.io.File;
41
+import java.io.FileWriter;
42
+import java.io.IOException;
43
+import java.nio.ByteBuffer;
44
+import java.nio.ByteOrder;
45
+import java.util.Arrays;
46
+import java.util.HashMap;
47
+import java.util.HashSet;
48
+import java.util.Map;
49
+import java.util.Set;
50
+import java.util.concurrent.LinkedBlockingQueue;
51
+import java.util.concurrent.TimeUnit;
52
+
55 53
 public abstract class PtpCamera implements Camera {
56 54
 
57 55
     public interface IO {
@@ -189,13 +187,6 @@ public abstract class PtpCamera implements Camera {
189 187
         if (AppConfig.LOG) {
190 188
             Log.i(TAG, deviceInfo.toString());
191 189
         }
192
-        if (AppConfig.USE_ACRA) {
193
-            try {
194
-                ErrorReporter.getInstance().putCustomData("deviceInfo", deviceInfo.toString());
195
-            } catch (Throwable e) {
196
-                // no fail
197
-            }
198
-        }
199 190
         this.deviceInfo = deviceInfo;
200 191
 
201 192
         Set<Integer> operations = new HashSet<Integer>();

+ 3 - 14
app/src/main/java/com/remoteyourcam/usb/ptp/commands/nikon/NikonGetLiveViewImageCommand.java

@@ -15,11 +15,6 @@
15 15
  */
16 16
 package com.remoteyourcam.usb.ptp.commands.nikon;
17 17
 
18
-import java.nio.ByteBuffer;
19
-import java.nio.ByteOrder;
20
-
21
-import org.acra.ErrorReporter;
22
-
23 18
 import android.graphics.BitmapFactory;
24 19
 import android.graphics.BitmapFactory.Options;
25 20
 import android.util.Log;
@@ -33,6 +28,9 @@ import com.remoteyourcam.usb.ptp.PtpConstants.Product;
33 28
 import com.remoteyourcam.usb.ptp.PtpConstants.Response;
34 29
 import com.remoteyourcam.usb.ptp.model.LiveViewData;
35 30
 
31
+import java.nio.ByteBuffer;
32
+import java.nio.ByteOrder;
33
+
36 34
 public class NikonGetLiveViewImageCommand extends NikonCommand {
37 35
 
38 36
     private static boolean haveAddedDumpToAcra = false;
@@ -112,15 +110,6 @@ public class NikonGetLiveViewImageCommand extends NikonCommand {
112 110
             pictureOffset = 384;
113 111
             break;
114 112
         default:
115
-            if (AppConfig.USE_ACRA && !haveAddedDumpToAcra) {
116
-                try {
117
-                    haveAddedDumpToAcra = true;
118
-                    String hex = PacketUtil.hexDumpToString(b.array(), start, length < 728 ? length : 728);
119
-                    ErrorReporter.getInstance().putCustomData("liveview hexdump", hex);
120
-                } catch (Throwable e) {
121
-                    // no fail
122
-                }
123
-            }
124 113
             return;
125 114
         }
126 115