diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-03-25 12:43:50 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-03-25 12:43:50 +0300 |
| commit | 741210cfe35bbccaba5ee69721dca3c119ee4461 (patch) | |
| tree | 32d621d0ab37f95e8574f6dd17dcb8a8c0859e4e /app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java | |
| parent | 748ca5989bb953ebfa6d07e79658443ff4bed189 (diff) | |
| parent | c42ceb2d8dc5aba6d556cb6fa76a2c6c5d6670a4 (diff) | |
Merge branch 'master' into refactor-drawer-and-main-and-use-viewpager2
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/Application.java
# app/src/main/java/it/niedermann/nextcloud/deck/ui/DrawerActivity.java
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java index 21b29ee84..1a1b0b45c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java @@ -6,12 +6,12 @@ import android.content.SharedPreferences; import android.database.sqlite.SQLiteConstraintException; import android.net.Uri; import android.os.Bundle; -import android.preference.PreferenceManager; import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.PreferenceManager; import com.nextcloud.android.sso.AccountImporter; import com.nextcloud.android.sso.exceptions.AccountImportCancelledException; |