diff options
author | Unpublished <unpublished@gmx.net> | 2021-02-12 13:10:52 +0300 |
---|---|---|
committer | Unpublished <unpublished@gmx.net> | 2021-02-14 10:04:23 +0300 |
commit | 3fc24f698c6457eea4e87d9cefc86da8b0748d01 (patch) | |
tree | 433c1b9c84dccbda5b0c0be23367dff66ad153ae | |
parent | 22d50c3af94f61500784589f29c95e5de7141d61 (diff) |
Fix build after conflict
Signed-off-by: Unpublished <unpublished@gmx.net>
-rw-r--r-- | News-Android-App/build.gradle | 3 | ||||
-rw-r--r-- | News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index cda72f9f..d984a443 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -128,7 +128,6 @@ repositories { } final DAGGER_VERSION = '2.27' -final BUTTERKNIFE_VERSION = '10.2.1' final ESPRESSO_VERSION = '3.3.0' final OKHTTP_VERSION = '3.12.10' final MOCKITO_VERSION = '3.6.28' @@ -142,7 +141,7 @@ dependencies { // implementation 'com.google.android.gms:play-services:4.2.42' // implementation project(':Android-SingleSignOn') // implementation project(path: ':MaterialShowcaseView:library', configuration: 'default') - implementation 'com.github.nextcloud:Android-SingleSignOn:0.5.5' + implementation 'com.github.nextcloud:Android-SingleSignOn:0.5.6' implementation 'com.github.David-Development:MaterialShowcaseView:bf6afa225d' implementation "androidx.core:core:1.3.2" diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java index 980d1244..e3c947ba 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java @@ -93,14 +93,6 @@ public class NewsDetailActivity extends PodcastFragmentActivity { SharedPreferences mPrefs; private boolean mShowFastActions; - - public static SORT_DIRECTION getSortDirectionFromSettings(SharedPreferences prefs) { - SORT_DIRECTION sDirection = SORT_DIRECTION.asc; - String sortDirection = prefs.getString(SettingsActivity.SP_SORT_ORDER, "1"); - if ("1".equals(sortDirection)) - sDirection = SORT_DIRECTION.desc; - return sDirection; - } @Override protected void onCreate(Bundle savedInstanceState) { |