From 29080b48284fc5c7810982bab1a365fe2be03988 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Tue, 22 Aug 2023 09:15:55 +0300 Subject: [PATCH 1/3] Update the app to work with flutter 3.13.0 --- app/android/gradle.properties | 10 ++++++++-- app/android/gradle/wrapper/gradle-wrapper.properties | 2 +- app/build.sh | 4 ++-- app/lib/screens/main_screen.dart | 2 +- app/lib/screens/sign_screen.dart | 1 - app/lib/widgets/preference_dialog.dart | 1 - app/pubspec.yaml | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/android/gradle.properties b/app/android/gradle.properties index ad2d0bea9..95db81cdb 100644 --- a/app/android/gradle.properties +++ b/app/android/gradle.properties @@ -1,6 +1,12 @@ org.gradle.parallel=true org.gradle.daemon=true org.gradle.configureondemand=true -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true +org.gradle.jvmargs=-Xmx1536M \ +--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ +--add-opens=java.base/java.lang=ALL-UNNAMED \ +--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ +--add-opens=java.base/java.io=ALL-UNNAMED \ +--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index 939efa295..562c5e444 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/app/build.sh b/app/build.sh index 051a70cf2..385f0f398 100755 --- a/app/build.sh +++ b/app/build.sh @@ -60,8 +60,8 @@ msgTelegramAndUploadToAppServer () { scp "build/app/outputs/apk/release/$current_time-TF-Connect-$1-$githash.apk" jimber@192.168.3.10:/opt/apps/threefold/$1/ - curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendMessage" -d parse_mode=markdown -d chat_id=-1001186043363 -d parse_mode=markdown -d text="Type: *$1* %0AGit user: *$gituser* %0AGit branch: *$gitbranch* %0AGit hash: *$githash* %0ATime: *$logcurrent_time* %0AMessage: *$2* %0AURL: *https://apps.staging.jimber.io/threefold/$1/*" -# curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendDocument" -F chat_id=-1001186043363 -F document="@build/app/outputs/apk/release/$githash-TF-Connect-$1-$current_time.apk" + # curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendMessage" -d parse_mode=markdown -d chat_id=-1001186043363 -d parse_mode=markdown -d text="Type: *$1* %0AGit user: *$gituser* %0AGit branch: *$gitbranch* %0AGit hash: *$githash* %0ATime: *$logcurrent_time* %0AMessage: *$2* %0AURL: *https://apps.staging.jimber.io/threefold/$1/*" + # curl --http1.1 -s -X POST "https://api.telegram.org/bot868129294:AAEd-UDDSru9zGeGklzWL6mPO33NovuXYqo/sendDocument" -F chat_id=-1001186043363 -F document="@build/app/outputs/apk/release/$githash-TF-Connect-$1-$current_time.apk" paplay /usr/share/sounds/gnome/default/alerts/glass.ogg } diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart index 1566ed376..57920f49c 100644 --- a/app/lib/screens/main_screen.dart +++ b/app/lib/screens/main_screen.dart @@ -138,7 +138,7 @@ class _AppState extends State { updateMessage = 'Checking if app is under maintenance'; setState(() {}); - await checkIfAppIsUnderMaintenance(); + // await checkIfAppIsUnderMaintenance(); updateMessage = 'Checking if app is up to date'; setState(() {}); diff --git a/app/lib/screens/sign_screen.dart b/app/lib/screens/sign_screen.dart index d600ce87a..bfc1576ee 100644 --- a/app/lib/screens/sign_screen.dart +++ b/app/lib/screens/sign_screen.dart @@ -390,7 +390,6 @@ class _SignScreenState extends State with BlockAndRunMixin { Widget jsonDataView() { return RawScrollbar( - isAlwaysShown: true, thumbColor: Theme.of(context).primaryColor, thickness: 3, child: Container( diff --git a/app/lib/widgets/preference_dialog.dart b/app/lib/widgets/preference_dialog.dart index e2ee157c8..e7d0ca473 100644 --- a/app/lib/widgets/preference_dialog.dart +++ b/app/lib/widgets/preference_dialog.dart @@ -140,7 +140,6 @@ class _PreferenceDialogState extends State { ), child: widget.scope != null ? RawScrollbar( - isAlwaysShown: true, thumbColor: Theme.of(context).primaryColor, thickness: 3, child: ListView.builder( diff --git a/app/pubspec.yaml b/app/pubspec.yaml index dc6fb14cd..5d1c9dd55 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -3,7 +3,7 @@ description: A decentralized login application publish_to: "none" -version: 3.7.3+172 +version: 3.8.0+173 environment: sdk: ">=2.12.0<3.0.0" From 938324de880082f00c1eea8e8d2ce7a071960a59 Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 23 Aug 2023 13:22:37 +0300 Subject: [PATCH 2/3] Fix getting flags values from flagsmith --- app/lib/helpers/flags.dart | 6 ++++-- app/lib/screens/main_screen.dart | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/lib/helpers/flags.dart b/app/lib/helpers/flags.dart index 6037f3c6f..9d2a28773 100644 --- a/app/lib/helpers/flags.dart +++ b/app/lib/helpers/flags.dart @@ -68,9 +68,11 @@ class Flags { String? doubleName = await getDoubleName(); if (doubleName != null) { Identity user = Identity(identifier: doubleName); - return (await client.hasFeatureFlag(name, user: user)); + return (await client.hasFeatureFlag(name, user: user) && + await client.isFeatureFlagEnabled(name, user: user)); } - return (await client.hasFeatureFlag(name)); + return (await client.hasFeatureFlag(name) && + await client.isFeatureFlagEnabled(name)); } Future getFlagValueByFeatureName(String name) async { diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart index 57920f49c..1566ed376 100644 --- a/app/lib/screens/main_screen.dart +++ b/app/lib/screens/main_screen.dart @@ -138,7 +138,7 @@ class _AppState extends State { updateMessage = 'Checking if app is under maintenance'; setState(() {}); - // await checkIfAppIsUnderMaintenance(); + await checkIfAppIsUnderMaintenance(); updateMessage = 'Checking if app is up to date'; setState(() {}); From 9b458d7de00d15e613a6255e5234a0e3315a06fb Mon Sep 17 00:00:00 2001 From: ahmedhanafy725 Date: Wed, 23 Aug 2023 13:41:39 +0300 Subject: [PATCH 3/3] Add app signing config back --- app/android/app/build_production | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/android/app/build_production b/app/android/app/build_production index 2d8c48b85..2f2bb47bc 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -57,10 +57,10 @@ android { signingConfigs { release { - // keyAlias localProperties.getProperty('keyAlias') - // keyPassword localProperties.getProperty('keyPassword') - // storeFile file(localProperties.getProperty('storeFile')) - // storePassword localProperties.getProperty('storePassword') + keyAlias localProperties.getProperty('keyAlias') + keyPassword localProperties.getProperty('keyPassword') + storeFile file(localProperties.getProperty('storeFile')) + storePassword localProperties.getProperty('storePassword') } debug { @@ -91,4 +91,4 @@ dependencies { implementation "com.github.shuftipro:ShuftiPro_SDK:0.6.0" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" -} \ No newline at end of file +}