Issue 29329928: Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

Issue 29329928: Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies (Closed)

Created:
Nov. 10, 2015, 4:32 p.m. by René Jeschke

Modified:
Nov. 21, 2015, 10:46 a.m.

Reviewers:
Felix Dahlke

Visibility:
Public.

Description

Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

Patch Set 2 : MinSDK and copy'n'paste #

Created: Nov. 20, 2015, 12:19 p.m.

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+175 lines, -217 lines)			Patch
M	AndroidManifest.xml	View	1	1 chunk	+1 line, -1 line	0 comments	Download
M	dependencies	View		1 chunk	+1 line, -1 line	0 comments	Download
M	jni/Android.mk	View		2 chunks	+5 lines, -5 lines	0 comments	Download
M	jni/Application.mk	View		1 chunk	+3 lines, -3 lines	0 comments	Download
M	jni/JniCallbacks.h	View		1 chunk	+10 lines, -0 lines	0 comments	Download
M	jni/JniFilterEngine.cpp	View	1	5 chunks	+39 lines, -11 lines	0 comments	Download
M	jni/JniJsEngine.cpp	View		2 chunks	+1 line, -2 lines	0 comments	Download
M	jni/JniNotification.cpp	View		2 chunks	+2 lines, -2 lines	0 comments	Download
A +	jni/JniShowNotificationCallback.cpp	View		2 chunks	+12 lines, -13 lines	0 comments	Download
M	jni/Utils.h	View		2 chunks	+2 lines, -2 lines	0 comments	Download
M	src/org/adblockplus/android/ABPEngine.java	View		5 chunks	+11 lines, -11 lines	0 comments	Download
M	src/org/adblockplus/android/AdblockPlus.java	View		1 chunk	+0 lines, -17 lines	0 comments	Download
A	src/org/adblockplus/android/AndroidShowNotificationCallback.java	View		1 chunk	+57 lines, -0 lines	0 comments	Download
M	src/org/adblockplus/android/ProxyService.java	View		5 chunks	+0 lines, -123 lines	0 comments	Download
M	src/org/adblockplus/libadblockplus/AppInfo.java	View		5 chunks	+2 lines, -11 lines	0 comments	Download
M	src/org/adblockplus/libadblockplus/FilterEngine.java	View		2 chunks	+26 lines, -12 lines	0 comments	Download
A +	src/org/adblockplus/libadblockplus/ShowNotificationCallback.java	View		2 chunks	+3 lines, -3 lines	0 comments	Download

Messages

Total messages: 5

Expand All Messages | Collapse All Messages

Felix Dahlke

Sorry for the delay! Looks great, just a few comments. https://codereview.adblockplus.org/29329928/diff/29329929/jni/Application.mk File jni/Application.mk (right): https://codereview.adblockplus.org/29329928/diff/29329929/jni/Application.mk#newcode4 ...

Nov. 20, 2015, 7:53 a.m. (2015-11-20 07:53:52 UTC) #2

René Jeschke

https://codereview.adblockplus.org/29329928/diff/29329929/jni/Application.mk File jni/Application.mk (right): https://codereview.adblockplus.org/29329928/diff/29329929/jni/Application.mk#newcode4 jni/Application.mk:4: APP_PLATFORM := android-9 On 2015/11/20 07:53:52, Felix Dahlke wrote: ...

Nov. 20, 2015, 12:19 p.m. (2015-11-20 12:19:16 UTC) #3

Felix Dahlke

Nov. 20, 2015, 12:21 p.m. (2015-11-20 12:21:28 UTC) #5

LGTM

https://codereview.adblockplus.org/29329928/diff/29329929/src/org/adblockplus...
File src/org/adblockplus/libadblockplus/ShowNotificationCallback.java (right):

https://codereview.adblockplus.org/29329928/diff/29329929/src/org/adblockplus...
src/org/adblockplus/libadblockplus/ShowNotificationCallback.java:20: public
abstract class ShowNotificationCallback implements Disposable
On 2015/11/20 12:19:15, René Jeschke wrote:
> On 2015/11/20 07:53:52, Felix Dahlke wrote:
> > This change looks strange, isn't this a new file? Did anything happen to
> > UpdateAvailableCallback.java?
> 
> It actually is a new file, git also displays it as a new one, strangely
> upload.py seems to base it on UpdateAvailableCallback.
> 
> So, no, UpdateAvailableCallback has not been changed nor deleted.

OK, thought so. Maybe it has to do with Git's magic about detecting renames or
something.

Expand All Messages | Collapse All Messages