nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

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] <support@dependabot.com>

* Fix com.github.triplet.play dependency setup

* gradle-wrapper.properties: Update gradle 6.0.1 > 6.2.2

from: 5ad55348b8

* 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.: 5755ed45ad

* Migrate to AndroidX, solves lint error "IncompatibleGradle"

according to:
- b04489e062

* Fix lint error: MissingPermission, catch SecurityException

* Revert "Create setenv.cmd"

This reverts commit e39c460837.

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Catfriend1 <Catfriend1@users.noreply.github.com>
This commit is contained in:
dependabot-preview[bot] 2020-05-17 15:04:32 +01:00 committed by GitHub
parent 78e1aa2084
commit d657bfdc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 132 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/build.gradle
View File

@ -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 {

3
app/src/main/AndroidManifest.xml
View File

@ -5,6 +5,7 @@
<uses-feature android:name="android.software.leanback" android:required="false" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
@ -18,6 +19,8 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!-- FOREGROUND_SERVICE is required to create a foreground service on 9 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<!-- ACCESS_FINE_LOCATION is required to get WiFi's SSID on 10 "Q" -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<application
android:allowBackup="false"

6
app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java
View File

@ -6,9 +6,9 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.SwitchCompat;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.SwitchCompat;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;

12
app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
View File

@ -10,12 +10,12 @@ import android.graphics.Color;
import android.Manifest;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatActivity;
import android.text.Html;
import android.util.Log;
import android.view.LayoutInflater;

10
app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
View File

@ -8,9 +8,9 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.provider.DocumentFile;
import android.support.v7.widget.SwitchCompat;
import android.support.v7.app.AlertDialog;
import androidx.documentfile.provider.DocumentFile;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@ -44,8 +44,8 @@ import java.util.Random;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import static android.support.v4.view.MarginLayoutParamsCompat.setMarginEnd;
import static android.support.v4.view.MarginLayoutParamsCompat.setMarginStart;
import static androidx.core.view.MarginLayoutParamsCompat.setMarginEnd;
import static androidx.core.view.MarginLayoutParamsCompat.setMarginStart;
import static android.util.TypedValue.COMPLEX_UNIT_DIP;
import static android.view.Gravity.CENTER_VERTICAL;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

8
app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
View File

@ -11,10 +11,10 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;

4
app/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
View File

@ -3,8 +3,8 @@ package com.nutomic.syncthingandroid.activities;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.widget.ShareActionProvider;
import androidx.core.view.MenuItemCompat;
import androidx.appcompat.widget.ShareActionProvider;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;

22
app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
View File

@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.activities;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
@ -21,16 +21,16 @@ import android.os.Bundle;
import android.os.IBinder;
import android.os.PowerManager;
import android.provider.Settings;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarDrawerToggle;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.core.content.ContextCompat;
import androidx.core.view.GravityCompat;
import androidx.viewpager.widget.ViewPager;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.ActionBarDrawerToggle;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;

6
app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
View File

@ -14,9 +14,9 @@ import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.TaskStackBuilder;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.TaskStackBuilder;
import android.text.TextUtils;
import android.util.Log;
import android.widget.ListAdapter;

10
app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java
View File

@ -1,13 +1,13 @@
package com.nutomic.syncthingandroid.activities;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.appcompat.app.AlertDialog;
import android.view.View;
import com.nutomic.syncthingandroid.R;

2
app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java
View File

@ -6,7 +6,7 @@ import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import com.annimon.stream.Stream;
import com.nutomic.syncthingandroid.R;

4
app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java
View File

@ -3,8 +3,8 @@ package com.nutomic.syncthingandroid.activities;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.AppCompatDelegate;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import com.nutomic.syncthingandroid.service.Constants;

4
app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java
View File

@ -3,8 +3,8 @@ package com.nutomic.syncthingandroid.activities;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Button;

2
app/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java
View File

@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.fragments;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.ListFragment;
import androidx.fragment.app.ListFragment;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;

6
app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java
View File

@ -4,9 +4,9 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;

2
app/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
View File

@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.fragments;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.ListFragment;
import androidx.fragment.app.ListFragment;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;

4
app/src/main/java/com/nutomic/syncthingandroid/fragments/NumberPickerFragment.java
View File

@ -1,8 +1,8 @@
package com.nutomic.syncthingandroid.fragments;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

4
app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/ExternalVersioningFragment.java
View File

@ -1,8 +1,8 @@
package com.nutomic.syncthingandroid.fragments.dialog;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;

4
app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/NoVersioningFragment.java
View File

@ -1,8 +1,8 @@
package com.nutomic.syncthingandroid.fragments.dialog;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

4
app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/SimpleVersioningFragment.java
View File

@ -1,8 +1,8 @@
package com.nutomic.syncthingandroid.fragments.dialog;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

4
app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/StaggeredVersioningFragment.java
View File

@ -3,8 +3,8 @@ package com.nutomic.syncthingandroid.fragments.dialog;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

4
app/src/main/java/com/nutomic/syncthingandroid/fragments/dialog/TrashCanVersioningFragment.java
View File

@ -1,8 +1,8 @@
package com.nutomic.syncthingandroid.fragments.dialog;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

2
app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java
View File

@ -4,7 +4,7 @@ package com.nutomic.syncthingandroid.http;
import android.content.Context;
import android.graphics.Bitmap;
import android.net.Uri;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import android.widget.ImageView;

2
app/src/main/java/com/nutomic/syncthingandroid/http/GetRequest.java
View File

@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.http;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.android.volley.Request;
import com.google.common.base.Optional;

2
app/src/main/java/com/nutomic/syncthingandroid/http/ImageGetRequest.java
View File

@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.http;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.google.common.base.Optional;

2
app/src/main/java/com/nutomic/syncthingandroid/http/PostRequest.java
View File

@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.http;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.android.volley.Request;
import com.google.common.base.Optional;

4
app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java
View File

@ -8,8 +8,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.support.annotation.StringRes;
import android.support.v4.app.NotificationCompat;
import androidx.annotation.StringRes;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import com.nutomic.syncthingandroid.R;

2
app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java
View File

@ -15,7 +15,7 @@ import android.net.wifi.WifiManager;
import android.os.BatteryManager;
import android.os.Build;
import android.os.PowerManager;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import com.nutomic.syncthingandroid.SyncthingApp;

4
app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
View File

@ -7,8 +7,8 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import android.util.Log;
import com.android.PRNGFixes;

2
app/src/main/java/com/nutomic/syncthingandroid/util/FileUtils.java
View File

@ -8,7 +8,7 @@ import android.os.Build;
import android.os.Environment;
import android.os.storage.StorageManager;
import android.provider.DocumentsContract;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.Log;
import java.io.File;

2
app/src/main/java/com/nutomic/syncthingandroid/util/Util.java
View File

@ -9,7 +9,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.util.Log;
import android.widget.Toast;

4
app/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
View File

@ -2,8 +2,8 @@ package com.nutomic.syncthingandroid.views;
import android.content.Context;
import android.content.res.Resources;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

2
app/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java
View File

@ -1,7 +1,7 @@
package com.nutomic.syncthingandroid.views;
import android.content.Context;
import android.support.v7.widget.AppCompatEditText;
import androidx.appcompat.widget.AppCompatEditText;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.inputmethod.EditorInfo;

6
app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java
View File

@ -2,10 +2,10 @@ package com.nutomic.syncthingandroid.views;
import android.content.Context;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import androidx.databinding.DataBindingUtil;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;

4
app/src/main/java/com/nutomic/syncthingandroid/views/SttracePreference.java
View File

@ -5,8 +5,8 @@ import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.preference.MultiSelectListPreference;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.util.AttributeSet;
import android.util.Log;

11
app/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java
View File

@ -9,8 +9,8 @@ import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
import android.preference.MultiSelectListPreference;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.util.AttributeSet;
import android.widget.Toast;
@ -132,7 +132,12 @@ public class WifiSsidPreference extends MultiSelectListPreference {
WifiManager wifiManager = (WifiManager)
getContext().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
if (wifiManager != null) {
List<WifiConfiguration> configuredNetworks = wifiManager.getConfiguredNetworks();
List<WifiConfiguration> 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()]);

2
app/src/main/res/layout/activity_first_start.xml
View File

@ -8,7 +8,7 @@
tools:context="com.nutomic.syncthingandroid.activities.FirstStartActivity"
tools:showIn="@layout/activity_first_start">
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />

1
app/src/main/res/layout/activity_firststart_slide1.xml
View File

@ -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" />

1
app/src/main/res/layout/activity_firststart_slide2.xml
View File

@ -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" />

1
app/src/main/res/layout/activity_firststart_slide3.xml
View File

@ -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" />

8
app/src/main/res/layout/activity_main.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -11,7 +11,7 @@
<include layout="@layout/widget_toolbar" />
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -19,7 +19,7 @@
android:elevation="@dimen/toolbar_elevation"
android:theme="@style/ThemeOverlay.Syncthing.Toolbar" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@ -34,4 +34,4 @@
android:clickable="true"
android:elevation="16dp"
android:focusable="true" />
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

4
app/src/main/res/layout/activity_share.xml
View File

@ -16,7 +16,7 @@
<include layout="@layout/widget_toolbar" />
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@ -158,6 +158,6 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/sub_directory_Textview" />
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</ScrollView>

4
app/src/main/res/layout/fragment_device.xml
View File

@ -102,7 +102,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/introducer"
style="@style/Widget.Syncthing.TextView.Label.Details"
android:layout_width="match_parent"
@ -112,7 +112,7 @@
android:drawableStart="@drawable/ic_phonelink_24dp"
android:text="@string/introducer" />
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/devicePause"
style="@style/Widget.Syncthing.TextView.Label.Details"
android:layout_width="match_parent"

4
app/src/main/res/layout/fragment_drawer.xml
View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.LinearLayoutCompat
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/bottomActions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -38,7 +38,7 @@
android:clickable="true"
android:focusable="true" />
</android.support.v7.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<ScrollView
android:layout_width="match_parent"

1
app/src/main/res/layout/fragment_external_versioning.xml
View File

@ -9,6 +9,7 @@
android:layout_margin="10dp"
android:text="@string/command"
android:textAlignment="center"
android:layout_gravity="center_horizontal"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />

4
app/src/main/res/layout/fragment_folder.xml
View File

@ -116,7 +116,7 @@
</LinearLayout>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/fileWatcher"
style="@style/Widget.Syncthing.TextView.Label.Details"
android:layout_width="match_parent"
@ -137,7 +137,7 @@
android:text="@string/folder_fileWatcherDescription"
android:focusable="false"/>
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/folderPause"
style="@style/Widget.Syncthing.TextView.Label.Details"
android:layout_width="match_parent"

3
app/src/main/res/layout/fragment_simple_versioning.xml
View File

@ -21,6 +21,7 @@
android:layout_margin="10dp"
android:text="@string/keep_versions"
android:textAlignment="center"
android:layout_gravity="center_horizontal"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
@ -40,4 +41,4 @@
android:layout_margin="10dp" />
</LinearLayout>
</ScrollView>
</ScrollView>

4
app/src/main/res/layout/fragment_staggered_versioning.xml
View File

@ -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" />
</LinearLayout>
</LinearLayout>

3
app/src/main/res/layout/fragment_trashcan_versioning.xml
View File

@ -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" />
</LinearLayout>
</ScrollView>
</ScrollView>

2
app/src/main/res/layout/item_device_form.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Widget.Syncthing.TextView.Label.Details.DeviceList"
android:id="@+id/device_toggle"

2
app/src/main/res/layout/widget_toolbar.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"

2
app/src/main/res/menu/log_list.xml
View File

@ -10,6 +10,6 @@
<item
android:id="@+id/menu_share"
android:title="@string/share_title"
app:actionProviderClass="android.support.v7.widget.ShareActionProvider" />
app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" />
</menu>

6
build.gradle
View File

@ -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()

2
gradle.properties Normal file
View File

@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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