From 94a3c994a7a5970be3b3bb9d290f9e1d8d437034 Mon Sep 17 00:00:00 2001 From: Pierre GRANDIN Date: Wed, 25 Jan 2017 10:42:08 -0800 Subject: Android patches from Jandegr (#202) * ndk downgrade ndk downgrade * ndk downgrade * Update build_android.sh * Update build_android_x86.sh * Update build_android.sh * Update build_android_x86.sh * Update build_android_x86.sh * Update build_android.sh * Update NavitAppConfig.java * Add files via upload * Delete acra-4.3.0b2.jar * Update NavitAppConfig.java --- ci/build_android.sh | 6 +++--- ci/build_android_x86.sh | 6 +++--- navit/android/libs/acra-4.3.0b2.jar | Bin 96994 -> 0 bytes navit/android/libs/acra-4.8.5.jar | Bin 0 -> 154375 bytes navit/android/libs/android-support-v4.jar | Bin 0 -> 1364299 bytes .../src/org/navitproject/navit/NavitAppConfig.java | 8 ++++++-- 6 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 navit/android/libs/acra-4.3.0b2.jar create mode 100644 navit/android/libs/acra-4.8.5.jar create mode 100644 navit/android/libs/android-support-v4.jar diff --git a/ci/build_android.sh b/ci/build_android.sh index 610dbc6e2..dc858e2ca 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -5,15 +5,15 @@ export ARCH="arm" export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake" -export ANDROID_NDK=~/android-ndk-r13 +export ANDROID_NDK=~/android-ndk-r11c export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin" export ANDROID_SDK="/usr/local/android-sdk-linux/" export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH export BUILD_PATH=$START_PATH"/android-${ARCH}" -wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip -[ -d ~/android-ndk-r13 ] || unzip -q -d ~ android-ndk-r13-linux-x86_64.zip +wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip +[ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH cd $BUILD_PATH diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index b42d03d9f..c5a421cbe 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -5,15 +5,15 @@ export arch="x86" export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" -export ANDROID_NDK=~/android-ndk-r13 +export ANDROID_NDK=~/android-ndk-r11c export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin" export ANDROID_SDK="/usr/local/android-sdk-linux/" export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools" export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH export BUILD_PATH=$START_PATH"/android-${ARCH}" -wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip -[ -d ~/android-ndk-r13 ] || unzip -q -d ~ android-ndk-r13-linux-x86_64.zip +wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip +[ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH cd $BUILD_PATH diff --git a/navit/android/libs/acra-4.3.0b2.jar b/navit/android/libs/acra-4.3.0b2.jar deleted file mode 100644 index 259a69581..000000000 Binary files a/navit/android/libs/acra-4.3.0b2.jar and /dev/null differ diff --git a/navit/android/libs/acra-4.8.5.jar b/navit/android/libs/acra-4.8.5.jar new file mode 100644 index 000000000..f0044ece8 Binary files /dev/null and b/navit/android/libs/acra-4.8.5.jar differ diff --git a/navit/android/libs/android-support-v4.jar b/navit/android/libs/android-support-v4.jar new file mode 100644 index 000000000..aa0b1a5cc Binary files /dev/null and b/navit/android/libs/android-support-v4.jar differ diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java index 32f003f18..13ccc9bb4 100755 --- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java +++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java @@ -8,10 +8,14 @@ import org.navitproject.navit.NavitAddressSearchActivity.NavitAddress; import android.app.Application; import android.content.SharedPreferences; import android.util.Log; - +import org.acra.*; import org.acra.annotation.*; -@ReportsCrashes(formKey = "dGlrNVRIOVVKYjB0UGVoLUZPanlzWFE6MQ") +//@ReportsCrashes(formKey = "dGlrNVRIOVVKYjB0UGVoLUZPanlzWFE6MQ") +@ReportsCrashes(mailTo = "android@navit-project.org", + mode = ReportingInteractionMode.TOAST, + resToastText = R.string.app_name) + public class NavitAppConfig extends Application { private static final int MAX_LAST_ADDRESSES = 10; -- cgit v1.2.1 From 5ae7e6379326588f98cfd8a774aa0caec286646d Mon Sep 17 00:00:00 2001 From: jandegr Date: Wed, 25 Jan 2017 20:50:40 +0100 Subject: Jandegr patch 1 (#203) * ndk downgrade ndk downgrade * ndk downgrade * Update build_android.sh * Update build_android_x86.sh * Update build_android.sh * Update build_android_x86.sh * Update build_android_x86.sh * Update build_android.sh * Update NavitAppConfig.java * Add files via upload * Delete acra-4.3.0b2.jar * Update NavitAppConfig.java * Update Navit.java * Update AndroidManifest.xml.cmake * Update Navit.java * Update Navit.java --- navit/android/AndroidManifest.xml.cmake | 10 ++++++++++ navit/android/src/org/navitproject/navit/Navit.java | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake index b5bd757cb..7aa882bb8 100644 --- a/navit/android/AndroidManifest.xml.cmake +++ b/navit/android/AndroidManifest.xml.cmake @@ -37,5 +37,15 @@ + + diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index c8578df07..11a1919b7 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -303,8 +303,8 @@ public class Navit extends Activity PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0); // FIXME : needs a fix for sdk 23 // NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent); // Set the text in the notification - NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT; // Ensure that the notification appears in Ongoing - nm.notify(R.string.app_name, NavitNotification); // Set the notification +// NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT; // Ensure that the notification appears in Ongoing +// nm.notify(R.string.app_name, NavitNotification); // Set the notification // Status and navigation bar sizes // These are platform defaults and do not change with rotation, but we have to figure out which ones apply @@ -864,8 +864,8 @@ public class Navit extends Activity public void exit() { - NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - nm.cancel(R.string.app_name); +// NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); +// nm.cancel(R.string.app_name); NavitVehicle.removeListener(); NavitDestroy(); } -- cgit v1.2.1