From 52dfdda3fd3de754c0bf05f28a173e956dc8ae3e Mon Sep 17 00:00:00 2001 From: NudeDude Date: Wed, 26 Sep 2018 23:25:39 +0200 Subject: [PATCH] bug fix updated gradle dependencies --- .idea/assetWizardSettings.xml | 32 ------------------- .idea/inspectionProfiles/Project_Default.xml | 6 ---- .idea/misc.xml | 10 ++++-- .idea/statistic.xml | 10 ------ .idea/vcs.xml | 2 +- .../twidda/backend/ProfileLoader.java | 9 +++--- .../twidda/backend/TwitterSearch.java | 6 ++-- .../twidda/backend/clickable/Tagger.java | 4 +-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 20 insertions(+), 63 deletions(-) delete mode 100644 .idea/assetWizardSettings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/statistic.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index df60fbb4..00000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index d606a954..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 99202cc2..b0c7b20c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,27 +5,31 @@ - + diff --git a/.idea/statistic.xml b/.idea/statistic.xml deleted file mode 100644 index a71a751f..00000000 --- a/.idea/statistic.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f..35eb1ddf 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java index 467992cb..4ea387d4 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -270,6 +270,11 @@ public class ProfileLoader extends AsyncTask { protected void onPostExecute(final Long MODE) { if (ui.get() == null) return; + SwipeRefreshLayout homeReload = ui.get().findViewById(R.id.hometweets); + SwipeRefreshLayout favReload = ui.get().findViewById(R.id.homefavorits); + homeReload.setRefreshing(false); + favReload.setRefreshing(false); + if (MODE == ACTION_FOLLOW) { if (isFollowing) Toast.makeText(ui.get(), R.string.followed, Toast.LENGTH_SHORT).show(); @@ -289,10 +294,6 @@ public class ProfileLoader extends AsyncTask { Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show(); } else if (MODE == FAILURE) { - SwipeRefreshLayout homeReload = ui.get().findViewById(R.id.hometweets); - SwipeRefreshLayout favReload = ui.get().findViewById(R.id.homefavorits); - homeReload.setRefreshing(false); - favReload.setRefreshing(false); switch (returnCode) { case 420: diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java index d6a66114..3c9ea293 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java @@ -99,10 +99,10 @@ public class TwitterSearch extends AsyncTask { protected void onPostExecute(Boolean success) { if (ui.get() == null) return; - if (!success) { - SwipeRefreshLayout tweetReload = ui.get().findViewById(R.id.searchtweets); - tweetReload.setRefreshing(false); + SwipeRefreshLayout tweetReload = ui.get().findViewById(R.id.searchtweets); + tweetReload.setRefreshing(false); + if (!success) { switch (returnCode) { case 420: Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/clickable/Tagger.java b/app/src/main/java/org/nuclearfog/twidda/backend/clickable/Tagger.java index daa76e2a..fc1ab5ef 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/clickable/Tagger.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/clickable/Tagger.java @@ -27,12 +27,12 @@ public abstract class Tagger { final int end = m.end(); sText.setSpan(new ClickableSpan() { @Override - public void onClick(View widget) { + public void onClick(@NonNull View widget) { l.onClick(text.substring(start, end)); } @Override - public void updateDrawState(TextPaint ds) { + public void updateDrawState(@NonNull TextPaint ds) { ds.setColor(color); ds.setUnderlineText(false); } diff --git a/build.gradle b/build.gradle index 1d81be75..4780a667 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e5fb770b..0db5b331 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-4.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip