From d657bfdc09e79b1986d5931d8848ea0557175e02 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 May 2020 15:04:32 +0100 Subject: [PATCH] Bump dependencies (AndroidX, com.github.triplet.play 2.7.5, gradle 3.6.3) (#1491) * Bump com.github.triplet.play from 2.5.0 to 2.7.5 Bumps com.github.triplet.play from 2.5.0 to 2.7.5. Signed-off-by: dependabot-preview[bot] * Fix com.github.triplet.play dependency setup * gradle-wrapper.properties: Update gradle 6.0.1 > 6.2.2 from: https://github.com/Catfriend1/syncthing-android/commit/5ad55348b8fff12ca3b47d87b68869d1e153f7f5 * build.gradle: Update "com.android.tools.build:gradle" from 3.5.3 to 3.6.3 * gradle.properties: + android.useAndroidX=true * Migrate to AndroidX: import androidx.databinding.DataBindingUtil * Create setenv.cmd * Fix lint error: RtlCompat Right-to-left text compatibility issues ../../src/main/res/layout/activity_firststart_slide1.xml:46: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 43 android:paddingLeft="@dimen/desc_padding" 44 android:paddingRight="@dimen/desc_padding" 45 android:text="@string/welcome_text" 46 android:textAlignment="center" 47 android:textColor="@android:color/white" 48 android:textSize="@dimen/slide_desc" /> 49 ../../src/main/res/layout/activity_firststart_slide2.xml:61: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 58 android:paddingLeft="@dimen/desc_padding" 59 android:paddingRight="@dimen/desc_padding" 60 android:text="@string/storage_permission_desc" 61 android:textAlignment="center" 62 android:textColor="@android:color/white" 63 android:textSize="@dimen/slide_desc" /> 64 ../../src/main/res/layout/activity_firststart_slide3.xml:61: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 58 android:paddingLeft="@dimen/desc_padding" 59 android:paddingRight="@dimen/desc_padding" 60 android:text="@string/location_permission_desc" 61 android:textAlignment="center" 62 android:textColor="@android:color/white" 63 android:textSize="@dimen/slide_desc" /> 64 ../../src/main/res/layout/fragment_external_versioning.xml:11: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 8 android:layout_height="wrap_content" 9 android:layout_margin="10dp" 10 android:text="@string/command" 11 android:textAlignment="center" 12 android:textColor="@android:color/black" 13 android:textSize="18sp" 14 android:textStyle="bold" /> ../../src/main/res/layout/fragment_simple_versioning.xml:23: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 20 android:layout_height="wrap_content" 21 android:layout_margin="10dp" 22 android:text="@string/keep_versions" 23 android:textAlignment="center" 24 android:textColor="@android:color/black" 25 android:textSize="18sp" 26 android:textStyle="bold" /> ../../src/main/res/layout/fragment_staggered_versioning.xml:17: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 14 android:layout_width="match_parent" 15 android:layout_height="wrap_content" 16 android:text="@string/maximum_age" 17 android:textAlignment="center" 18 android:textColor="@android:color/black" 19 android:textSize="18sp" 20 android:textStyle="bold" ../../src/main/res/layout/fragment_staggered_versioning.xml:44: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" 41 android:layout_height="wrap_content" 42 android:layout_margin="10dp" 43 android:text="@string/versions_path" 44 android:textAlignment="center" 45 android:textColor="@android:color/black" 46 android:textSize="18sp" 47 android:textStyle="bold" ../../src/main/res/layout/fragment_trashcan_versioning.xml:23: To support older versions than API 17 (project specifies 16) you must also specify gravity or layout_gravity="center_horizontal" * AndroidManifest: Add permission ACCESS_FINE_LOCATION Ref.: https://github.com/Catfriend1/syncthing-android/commit/5755ed45ad5de4f9d4ac1ddf3a2851e62a4545d9 * Migrate to AndroidX, solves lint error "IncompatibleGradle" according to: - https://github.com/Catfriend1/syncthing-android/commit/b04489e062feb525a3168fc09104c45ec61419fb * Fix lint error: MissingPermission, catch SecurityException * Revert "Create setenv.cmd" This reverts commit e39c460837ad3766887de3f7cf3378ddddcd1228. Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Catfriend1 --- app/build.gradle | 18 ++++++++------- app/src/main/AndroidManifest.xml | 3 +++ .../activities/DeviceActivity.java | 6 ++--- .../activities/FirstStartActivity.java | 12 +++++----- .../activities/FolderActivity.java | 10 ++++----- .../activities/FolderPickerActivity.java | 8 +++---- .../activities/LogActivity.java | 4 ++-- .../activities/MainActivity.java | 22 +++++++++---------- .../activities/SettingsActivity.java | 6 ++--- .../activities/StateDialogActivity.java | 10 ++++----- .../activities/SyncthingActivity.java | 2 +- .../activities/ThemedAppCompatActivity.java | 4 ++-- .../activities/VersioningDialogActivity.java | 4 ++-- .../fragments/DeviceListFragment.java | 2 +- .../fragments/DrawerFragment.java | 6 ++--- .../fragments/FolderListFragment.java | 2 +- .../fragments/NumberPickerFragment.java | 4 ++-- .../dialog/ExternalVersioningFragment.java | 4 ++-- .../dialog/NoVersioningFragment.java | 4 ++-- .../dialog/SimpleVersioningFragment.java | 4 ++-- .../dialog/StaggeredVersioningFragment.java | 4 ++-- .../dialog/TrashCanVersioningFragment.java | 4 ++-- .../syncthingandroid/http/ApiRequest.java | 2 +- .../syncthingandroid/http/GetRequest.java | 2 +- .../http/ImageGetRequest.java | 2 +- .../syncthingandroid/http/PostRequest.java | 2 +- .../service/NotificationHandler.java | 4 ++-- .../service/RunConditionMonitor.java | 2 +- .../service/SyncthingService.java | 4 ++-- .../syncthingandroid/util/FileUtils.java | 2 +- .../nutomic/syncthingandroid/util/Util.java | 2 +- .../views/DevicesAdapter.java | 4 ++-- .../views/EnhancedEditText.java | 2 +- .../views/FoldersAdapter.java | 6 ++--- .../views/SttracePreference.java | 4 ++-- .../views/WifiSsidPreference.java | 11 +++++++--- .../main/res/layout/activity_first_start.xml | 2 +- .../res/layout/activity_firststart_slide1.xml | 1 + .../res/layout/activity_firststart_slide2.xml | 1 + .../res/layout/activity_firststart_slide3.xml | 1 + app/src/main/res/layout/activity_main.xml | 8 +++---- app/src/main/res/layout/activity_share.xml | 4 ++-- app/src/main/res/layout/fragment_device.xml | 4 ++-- app/src/main/res/layout/fragment_drawer.xml | 4 ++-- .../layout/fragment_external_versioning.xml | 1 + app/src/main/res/layout/fragment_folder.xml | 4 ++-- .../res/layout/fragment_simple_versioning.xml | 3 ++- .../layout/fragment_staggered_versioning.xml | 4 +++- .../layout/fragment_trashcan_versioning.xml | 3 ++- app/src/main/res/layout/item_device_form.xml | 2 +- app/src/main/res/layout/widget_toolbar.xml | 2 +- app/src/main/res/menu/log_list.xml | 2 +- build.gradle | 6 +---- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- 55 files changed, 132 insertions(+), 116 deletions(-) create mode 100644 gradle.properties diff --git a/app/build.gradle b/app/build.gradle index c93bc26d..0b3c6b72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,21 +1,23 @@ -apply plugin: 'com.android.application' -apply plugin: 'com.github.ben-manes.versions' -apply plugin: 'com.github.triplet.play' +plugins { + id 'com.android.application' + id 'com.github.ben-manes.versions' + id 'com.github.triplet.play' version '2.7.5' +} dependencies { implementation 'eu.chainfire:libsuperuser:1.1.0.202004101746' - implementation 'com.android.support:design:28.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.zxing:android-integration:3.3.0' implementation 'com.google.code.gson:gson:2.8.6' implementation 'org.mindrot:jbcrypt:0.4' implementation 'com.google.guava:guava:29.0-android' implementation 'com.annimon:stream:1.2.1' implementation 'com.android.volley:volley:1.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.google.dagger:dagger:2.27' annotationProcessor "com.google.dagger:dagger-compiler:2.27" - androidTestImplementation 'com.android.support.test:rules:1.0.2' - androidTestImplementation 'com.android.support:support-annotations:28.0.0' + androidTestImplementation 'androidx.test:rules:1.1.1' + androidTestImplementation 'androidx.annotation:annotation:1.0.0' } android { @@ -38,7 +40,7 @@ android { versionCode 4231 versionName "1.6.0-rc.4" testApplicationId 'com.nutomic.syncthingandroid.test' - testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } signingConfigs { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c87ebe31..0f3a937d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + @@ -18,6 +19,8 @@ + + configuredNetworks = wifiManager.getConfiguredNetworks(); + List configuredNetworks = null; + try { + configuredNetworks = wifiManager.getConfiguredNetworks(); + } catch (SecurityException e) { + // See changes in Android Q, https://developer.android.com/reference/android/net/wifi/WifiManager.html#getConfiguredNetworks() + } // if WiFi is turned off, getConfiguredNetworks returns null on many devices if (configuredNetworks != null) { WifiConfiguration[] result = configuredNetworks.toArray(new WifiConfiguration[configuredNetworks.size()]); diff --git a/app/src/main/res/layout/activity_first_start.xml b/app/src/main/res/layout/activity_first_start.xml index 5b9c1662..5918e9c5 100644 --- a/app/src/main/res/layout/activity_first_start.xml +++ b/app/src/main/res/layout/activity_first_start.xml @@ -8,7 +8,7 @@ tools:context="com.nutomic.syncthingandroid.activities.FirstStartActivity" tools:showIn="@layout/activity_first_start"> - diff --git a/app/src/main/res/layout/activity_firststart_slide1.xml b/app/src/main/res/layout/activity_firststart_slide1.xml index fac7957a..ca26b8d5 100644 --- a/app/src/main/res/layout/activity_firststart_slide1.xml +++ b/app/src/main/res/layout/activity_firststart_slide1.xml @@ -44,6 +44,7 @@ android:paddingRight="@dimen/desc_padding" android:text="@string/welcome_text" android:textAlignment="center" + android:layout_gravity="center_horizontal" android:textColor="@android:color/white" android:textSize="@dimen/slide_desc" /> diff --git a/app/src/main/res/layout/activity_firststart_slide2.xml b/app/src/main/res/layout/activity_firststart_slide2.xml index 8b2d05fb..e495bd07 100644 --- a/app/src/main/res/layout/activity_firststart_slide2.xml +++ b/app/src/main/res/layout/activity_firststart_slide2.xml @@ -59,6 +59,7 @@ android:paddingRight="@dimen/desc_padding" android:text="@string/storage_permission_desc" android:textAlignment="center" + android:layout_gravity="center_horizontal" android:textColor="@android:color/white" android:textSize="@dimen/slide_desc" /> diff --git a/app/src/main/res/layout/activity_firststart_slide3.xml b/app/src/main/res/layout/activity_firststart_slide3.xml index 6a66d948..9d385fb8 100644 --- a/app/src/main/res/layout/activity_firststart_slide3.xml +++ b/app/src/main/res/layout/activity_firststart_slide3.xml @@ -59,6 +59,7 @@ android:paddingRight="@dimen/desc_padding" android:text="@string/location_permission_desc" android:textAlignment="center" + android:layout_gravity="center_horizontal" android:textColor="@android:color/white" android:textSize="@dimen/slide_desc" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6bf4e097..c39bcbf8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - @@ -11,7 +11,7 @@ - - @@ -34,4 +34,4 @@ android:clickable="true" android:elevation="16dp" android:focusable="true" /> - + diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml index 29f5762c..ad358d38 100644 --- a/app/src/main/res/layout/activity_share.xml +++ b/app/src/main/res/layout/activity_share.xml @@ -16,7 +16,7 @@ - - + diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml index 5066c7fa..e1de18a6 100644 --- a/app/src/main/res/layout/fragment_device.xml +++ b/app/src/main/res/layout/fragment_device.xml @@ -102,7 +102,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Caption" /> - - - - + diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 0c4a77d8..f9652dba 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -116,7 +116,7 @@ - - @@ -40,4 +41,4 @@ android:layout_margin="10dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_staggered_versioning.xml b/app/src/main/res/layout/fragment_staggered_versioning.xml index 0500735c..94e1b9fc 100644 --- a/app/src/main/res/layout/fragment_staggered_versioning.xml +++ b/app/src/main/res/layout/fragment_staggered_versioning.xml @@ -15,6 +15,7 @@ android:layout_height="wrap_content" android:text="@string/maximum_age" android:textAlignment="center" + android:layout_gravity="center_horizontal" android:textColor="@android:color/black" android:textSize="18sp" android:textStyle="bold" @@ -42,6 +43,7 @@ android:layout_margin="10dp" android:text="@string/versions_path" android:textAlignment="center" + android:layout_gravity="center_horizontal" android:textColor="@android:color/black" android:textSize="18sp" android:textStyle="bold" @@ -63,4 +65,4 @@ android:layout_margin="10dp" android:text="@string/versions_path_description" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_trashcan_versioning.xml b/app/src/main/res/layout/fragment_trashcan_versioning.xml index 8a51226e..0b3cbcdd 100644 --- a/app/src/main/res/layout/fragment_trashcan_versioning.xml +++ b/app/src/main/res/layout/fragment_trashcan_versioning.xml @@ -21,6 +21,7 @@ android:layout_height="wrap_content" android:text="@string/clean_out_after" android:textAlignment="center" + android:layout_gravity="center_horizontal" android:textColor="@android:color/black" android:textSize="18sp" android:layout_margin="10dp" @@ -41,4 +42,4 @@ android:layout_margin="10dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_device_form.xml b/app/src/main/res/layout/item_device_form.xml index 910808e9..22c62ac7 100644 --- a/app/src/main/res/layout/item_device_form.xml +++ b/app/src/main/res/layout/item_device_form.xml @@ -1,5 +1,5 @@ - - + app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" /> diff --git a/build.gradle b/build.gradle index 269d8d6b..3c85a14c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.github.ben-manes:gradle-versions-plugin:0.26.0' // NOTE: Do not place your application dependencies here; they belong @@ -14,10 +14,6 @@ buildscript { } } -plugins { - id 'com.github.triplet.play' version '2.5.0' -} - allprojects { repositories { google() diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..dbb7bf70 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c4388a9..a2bf1313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists