organicmaps/organicmaps-tmp

Archived

Fork 1

[android] Tag JNI methods and enable R8 optimizations #6199

Merged

root merged 2 commits from rt-android-jni-annotations into master

2023-10-29 16:14:47 +00:00

rtsisyk commented

2023-10-04 08:12:33 +00:00

Owner

R8 is not enabled for Debug, please test Beta or Release:

./gradlew -Parm64 runFdroidBeta

Results:

48534296 fdroid-beta-before.apk
45663208 fdroid-beta-after.apk

This patch saves almost 3MB or ~6%.

R8 is not enabled for Debug, please test Beta or Release: ``` ./gradlew -Parm64 runFdroidBeta ``` Results: ``` 48534296 fdroid-beta-before.apk 45663208 fdroid-beta-after.apk ``` This patch saves almost 3MB or ~6%.

vng (Migrated from github.com) reviewed 2023-10-04 08:12:33 +00:00

AndrewShkrob reviewed 2023-10-04 08:12:33 +00:00

Jean-BaptisteC (Migrated from github.com) reviewed 2023-10-04 08:12:33 +00:00

strump reviewed 2023-10-04 08:12:33 +00:00

biodranik (Migrated from github.com) approved these changes 2023-10-04 08:25:09 +00:00

biodranik (Migrated from github.com) left a comment

It should be carefully tested. Let's release it in a beta together with KMB fix (in the master) and street TTS announcements (on the branch).

strump reviewed 2023-10-04 08:48:26 +00:00

strump left a comment

Member

Some strange imports found

android/app/src/main/java/app/organicmaps/car/CarAppSession.java

strump commented

2023-10-04 08:44:58 +00:00

Member

Unused import?

android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java

strump commented

2023-10-04 08:45:32 +00:00

Member

Unused import?

android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java

strump commented

2023-10-04 08:45:39 +00:00

Member

Unused import?

android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java

strump commented

2023-10-04 08:45:55 +00:00

Member

Unused import?

android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java

strump commented

2023-10-04 08:47:03 +00:00

Member

Unused import?

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

strump commented

2023-10-04 08:48:10 +00:00

Member

Unused import?

Jean-BaptisteC (Migrated from github.com) requested changes 2023-10-04 10:24:16 +00:00

Jean-BaptisteC (Migrated from github.com) left a comment

❌ Pixel 6 - Android 13

Search location
Select arrow and add to bookmarks
Open place page
Edit bookmarks
Switch to another list and change color of list
Go back to map and leave place page
Open bookmarks bottom menu
Open list contain bookmark ->crash

10-04 12:13:12.946 E/AndroidRuntime(14960): FATAL EXCEPTION: main
10-04 12:13:12.946 E/AndroidRuntime(14960): Process: app.organicmaps.beta, PID: 14960
10-04 12:13:12.946 E/AndroidRuntime(14960): java.lang.RuntimeException: Unable to start activity ComponentInfo{app.organicmaps.beta/app.organicmaps.bookmarks.BookmarkListActivity}: java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.Class.isInterface()' on a null object reference
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3644)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:3781)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.servertransaction.LaunchActivityItem.execute(LaunchActivityItem.java:101)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.servertransaction.TransactionExecutor.executeCallbacks(TransactionExecutor.java:138)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:95)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2306)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Handler.dispatchMessage(Handler.java:106)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Looper.loopOnce(Looper.java:201)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Looper.loop(Looper.java:288)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.ActivityThread.main(ActivityThread.java:7918)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at java.lang.reflect.Method.invoke(Native Method)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936)
10-04 12:13:12.946 E/AndroidRuntime(14960): Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.Class.isInterface()' on a null object reference
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at java.lang.Class.isAssignableFrom(Class.java:824)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel.readParcelableCreatorInternal(Parcel.java:4900)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel.readParcelableInternal(Parcel.java:4807)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel.readValue(Parcel.java:4567)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel.readValue(Parcel.java:4347)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel.-$$Nest$mreadValue(Unknown Source:0)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel$LazyValue.apply(Parcel.java:4445)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Parcel$LazyValue.apply(Parcel.java:4404)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.BaseBundle.getValueAt(BaseBundle.java:394)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.BaseBundle.getValue(BaseBundle.java:374)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.BaseBundle.getValue(BaseBundle.java:357)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.BaseBundle.get(BaseBundle.java:696)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.os.Bundle.getParcelable(Bundle.java:953)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at androidx.activity.n.l(SourceFile:1)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at app.organicmaps.util.Utils.getParcelable(SourceFile:19)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at h2.r.z0(SourceFile:21)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at h2.r.R(SourceFile:4)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at androidx.fragment.app.w0.e(SourceFile:71)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at androidx.fragment.app.w0.k(SourceFile:149)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at androidx.fragment.app.p0.z(SourceFile:136)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at androidx.fragment.app.p0.T(SourceFile:82)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at androidx.fragment.app.p0.x(SourceFile:74)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at g2.c.V(SourceFile:57)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at g2.c.T(SourceFile:29)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at g2.f.T(SourceFile:1)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at g2.c.onCreate(SourceFile:150)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.Activity.performCreate(Activity.java:8342)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.Activity.performCreate(Activity.java:8321)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1417)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3625)
10-04 12:13:12.946 E/AndroidRuntime(14960): 	... 12 more
10-04 12:13:39.105 E/

❌ Pixel 6 - Android 13 - Search location - Select arrow and add to bookmarks - Open place page - Edit bookmarks - Switch to another list and change color of list - Go back to map and leave place page - Open bookmarks bottom menu - Open list contain bookmark ->crash ``` 10-04 12:13:12.946 E/AndroidRuntime(14960): FATAL EXCEPTION: main 10-04 12:13:12.946 E/AndroidRuntime(14960): Process: app.organicmaps.beta, PID: 14960 10-04 12:13:12.946 E/AndroidRuntime(14960): java.lang.RuntimeException: Unable to start activity ComponentInfo{app.organicmaps.beta/app.organicmaps.bookmarks.BookmarkListActivity}: java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.Class.isInterface()' on a null object reference 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3644) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:3781) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.servertransaction.LaunchActivityItem.execute(LaunchActivityItem.java:101) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.servertransaction.TransactionExecutor.executeCallbacks(TransactionExecutor.java:138) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:95) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2306) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Handler.dispatchMessage(Handler.java:106) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Looper.loopOnce(Looper.java:201) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Looper.loop(Looper.java:288) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.ActivityThread.main(ActivityThread.java:7918) 10-04 12:13:12.946 E/AndroidRuntime(14960): at java.lang.reflect.Method.invoke(Native Method) 10-04 12:13:12.946 E/AndroidRuntime(14960): at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548) 10-04 12:13:12.946 E/AndroidRuntime(14960): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:936) 10-04 12:13:12.946 E/AndroidRuntime(14960): Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.Class.isInterface()' on a null object reference 10-04 12:13:12.946 E/AndroidRuntime(14960): at java.lang.Class.isAssignableFrom(Class.java:824) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel.readParcelableCreatorInternal(Parcel.java:4900) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel.readParcelableInternal(Parcel.java:4807) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel.readValue(Parcel.java:4567) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel.readValue(Parcel.java:4347) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel.-$$Nest$mreadValue(Unknown Source:0) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel$LazyValue.apply(Parcel.java:4445) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Parcel$LazyValue.apply(Parcel.java:4404) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.BaseBundle.getValueAt(BaseBundle.java:394) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.BaseBundle.getValue(BaseBundle.java:374) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.BaseBundle.getValue(BaseBundle.java:357) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.BaseBundle.get(BaseBundle.java:696) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.os.Bundle.getParcelable(Bundle.java:953) 10-04 12:13:12.946 E/AndroidRuntime(14960): at androidx.activity.n.l(SourceFile:1) 10-04 12:13:12.946 E/AndroidRuntime(14960): at app.organicmaps.util.Utils.getParcelable(SourceFile:19) 10-04 12:13:12.946 E/AndroidRuntime(14960): at h2.r.z0(SourceFile:21) 10-04 12:13:12.946 E/AndroidRuntime(14960): at h2.r.R(SourceFile:4) 10-04 12:13:12.946 E/AndroidRuntime(14960): at androidx.fragment.app.w0.e(SourceFile:71) 10-04 12:13:12.946 E/AndroidRuntime(14960): at androidx.fragment.app.w0.k(SourceFile:149) 10-04 12:13:12.946 E/AndroidRuntime(14960): at androidx.fragment.app.p0.z(SourceFile:136) 10-04 12:13:12.946 E/AndroidRuntime(14960): at androidx.fragment.app.p0.T(SourceFile:82) 10-04 12:13:12.946 E/AndroidRuntime(14960): at androidx.fragment.app.p0.x(SourceFile:74) 10-04 12:13:12.946 E/AndroidRuntime(14960): at g2.c.V(SourceFile:57) 10-04 12:13:12.946 E/AndroidRuntime(14960): at g2.c.T(SourceFile:29) 10-04 12:13:12.946 E/AndroidRuntime(14960): at g2.f.T(SourceFile:1) 10-04 12:13:12.946 E/AndroidRuntime(14960): at g2.c.onCreate(SourceFile:150) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.Activity.performCreate(Activity.java:8342) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.Activity.performCreate(Activity.java:8321) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1417) 10-04 12:13:12.946 E/AndroidRuntime(14960): at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:3625) 10-04 12:13:12.946 E/AndroidRuntime(14960): ... 12 more 10-04 12:13:39.105 E/ ```

rtsisyk reviewed 2023-10-05 05:46:09 +00:00

android/app/src/main/java/app/organicmaps/car/CarAppSession.java