From 0c5762f689253dfd273d0c97afc05d37453196bb Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Tue, 10 Dec 2019 17:30:17 +0000 Subject: [PATCH 1/3] fix: branch release for open-event-attendee (#2484) --- scripts/update-apk.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/update-apk.sh b/scripts/update-apk.sh index 2b05746fa..81db73211 100644 --- a/scripts/update-apk.sh +++ b/scripts/update-apk.sh @@ -60,10 +60,9 @@ for file in app*; do done if $IS_PUBLISH_BRANCH ;then - cd .. gem install fastlane - fastlane supply --aab ./apk/eventyay-attendee-master-app-playStore-release.aab --skip_upload_apk true --track alpha --json_key ./scripts/fastlane.json --package_name $PACKAGE_NAME $FASTLANE_DRY_RUN - if [ $? -ne 0 ]; then + fastlane supply --aab eventyay-attendee-master-app-playStore-release.aab --skip_upload_apk true --track alpha --json_key ../scripts/fastlane.json --package_name $PACKAGE_NAME $FASTLANE_DRY_RUN + if [[ $? -ne 0 ]]; then exit 1 fi if $PR_FOR_RELEASE ;then From 096a7a16f20cd49dbf121f7aae2c9e92f570fd95 Mon Sep 17 00:00:00 2001 From: Shubham Pathak Date: Wed, 11 Dec 2019 00:07:31 +0530 Subject: [PATCH 2/3] fix: Move viewLifeCycleOwner reference to onCreateView (#2486) --- .../openevent/general/auth/AuthFragment.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt index e6d15a14b..0e3433388 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/AuthFragment.kt @@ -48,22 +48,11 @@ class AuthFragment : Fragment(), ComplexBackPressFragment { private val safeArgs: AuthFragmentArgs by navArgs() private val smartAuthViewModel by sharedViewModel() - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - if (BuildConfig.FLAVOR == PLAY_STORE_BUILD_FLAVOR) { - smartAuthViewModel.requestCredentials(SmartAuthUtil.getCredentialsClient(requireActivity())) - smartAuthViewModel.isCredentialStored - .nonNull() - .observe(viewLifecycleOwner, Observer { - if (it) redirectToLogin() - }) - } - } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { rootView = inflater.inflate(R.layout.fragment_auth, container, false) setSharedElementEnterTransition() setupToolbar() + checkCredentials() val progressDialog = progressDialog(context) @@ -136,6 +125,17 @@ class AuthFragment : Fragment(), ComplexBackPressFragment { } } + private fun checkCredentials() { + if (BuildConfig.FLAVOR == PLAY_STORE_BUILD_FLAVOR) { + smartAuthViewModel.requestCredentials(SmartAuthUtil.getCredentialsClient(requireActivity())) + smartAuthViewModel.isCredentialStored + .nonNull() + .observe(viewLifecycleOwner, Observer { + if (it) redirectToLogin() + }) + } + } + private fun setupToolbar() { setToolbar(activity, show = false) rootView.toolbar.setNavigationOnClickListener { From 9a12992bfa01f68ff64830e9ef9ba64e5dc36eee Mon Sep 17 00:00:00 2001 From: Areeb Jamal Date: Wed, 11 Dec 2019 00:11:21 +0530 Subject: [PATCH 3/3] chore: Update version for v0.9.1 (#2489) --- app/build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/17.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/17.txt diff --git a/app/build.gradle b/app/build.gradle index 9961bb604..24f235272 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.eventyay.attendee" minSdkVersion 21 targetSdkVersion 28 - versionCode 16 - versionName "0.9.0" + versionCode 17 + versionName "0.9.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true multiDexEnabled true diff --git a/fastlane/metadata/android/en-US/changelogs/17.txt b/fastlane/metadata/android/en-US/changelogs/17.txt new file mode 100644 index 000000000..6b112c898 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/17.txt @@ -0,0 +1,14 @@ +v0.9.1: + +- Fix app crash on startup/login + +🚀 Features + +- Reduce APK size by removing redundant Paypal binaries +- Enable PayPal payment option + +🐛 Bug Fixes + +- Fix app crash in search +- Some UI fixes +- Other fixes and dependency updates