Skip to content

Commit e5d0b27

Browse files
committed
* release 1.0.22
* corrected first run and usage tracking * small cleanup on image processor class
1 parent 6dd79bd commit e5d0b27

File tree

4 files changed

+10
-26
lines changed

4 files changed

+10
-26
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Change Log
22
==========
33

4+
version 1.0.22
5+
--------------
6+
7+
* fixed first run dialog
8+
49
version 1.0.21
510
--------------
611

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "com.todobom.opennotescanner"
88
minSdkVersion 21
99
targetSdkVersion 23
10-
versionCode 21
11-
versionName '1.0.21'
10+
versionCode 22
11+
versionName '1.0.22'
1212
}
1313
buildTypes {
1414
release {

app/src/main/java/com/todobom/opennotescanner/ImageProcessor.java

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public class ImageProcessor extends Handler {
6262
private int colorThresh = 110; // threshold
6363
private Size mPreviewSize;
6464
private Point[] mPreviewPoints;
65+
private ResultPoint[] qrResultPoints;
6566

6667

6768
public ImageProcessor ( Looper looper , Handler uiHandler , OpenNoteScannerActivity mainActivity ) {
@@ -95,7 +96,6 @@ public void handleMessage ( Message msg ) {
9596

9697
private void processPreviewFrame( PreviewFrame previewFrame ) {
9798

98-
9999
Result[] results = {};
100100

101101
Mat frame = previewFrame.getFrame();
@@ -116,34 +116,13 @@ private void processPreviewFrame( PreviewFrame previewFrame ) {
116116
Log.d(TAG, "QR Code valid: " + result.getText());
117117
qrOk = true;
118118
currentQR = qrText;
119+
qrResultPoints = result.getResultPoints();
119120
break;
120121
} else {
121122
Log.d(TAG, "QR Code ignored: " + result.getText());
122123
}
123124
}
124125

125-
int width = frame.width();
126-
int height = frame.height();
127-
128-
for (Result result : results) {
129-
ResultPoint[] rp = result.getResultPoints();
130-
131-
Point lpi = null;
132-
133-
for (int i = 0; i < rp.length; i += 1) {
134-
Point pi = new Point();
135-
pi.y = rp[i].getY();
136-
pi.x = rp[i].getX() + width/2 + height/4;
137-
138-
if (lpi != null) {
139-
// disabled - TODO: use a canvas on UI thread
140-
// Imgproc.line(previewFrame, lpi, pi, new Scalar(255, 0, 0), 10);
141-
}
142-
lpi = pi;
143-
}
144-
145-
}
146-
147126
boolean autoMode = previewFrame.isAutoMode();
148127
boolean previewOnly = previewFrame.isPreviewOnly();
149128

app/src/main/java/com/todobom/opennotescanner/OpenNoteScannerActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ protected void onCreate(Bundle savedInstanceState) {
170170

171171
mSharedPref = PreferenceManager.getDefaultSharedPreferences(this);
172172

173-
if (mSharedPref.getBoolean("isFirstRun",true)) {
173+
if (mSharedPref.getBoolean("isFirstRun",true) && !mSharedPref.getBoolean("usage_stats",false)) {
174174
statsOptInDialog();
175175
}
176176

0 commit comments

Comments
 (0)