From 02a6ef60504d24e4c38ee71ca21f6b9a669b857f Mon Sep 17 00:00:00 2001 From: David Luhmer Date: Mon, 3 Sep 2018 22:16:35 +0200 Subject: fix lint issues --- .../java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java | 10 ++++------ .../de/luhmer/owncloudnewsreader/NewsReaderListActivity.java | 4 ++-- .../de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java | 6 +----- .../main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'News-Android-App') diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java index cece039b..c0c985f4 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java @@ -31,13 +31,11 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.TextInputLayout; import android.support.v4.app.ActivityCompat; import android.support.v4.app.DialogFragment; -import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.InputType; @@ -153,7 +151,7 @@ public class LoginDialogFragment extends DialogFragment { attemptLogin(); } catch (NextcloudFilesAppNotSupportedException ex) { ex.printStackTrace(); - UiExceptionManager.ShowDialogForException(getActivity(), ex); + UiExceptionManager.showDialogForException(getActivity(), ex); } catch (Exception e) { e.printStackTrace(); Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); @@ -251,7 +249,7 @@ public class LoginDialogFragment extends DialogFragment { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if(isChecked) { - if (!VersionCheckHelper.VerifyMinVersion(getActivity(), MIN_NEXTCLOUD_FILES_APP_VERSION_CODE)) { + if (!VersionCheckHelper.verifyMinVersion(getActivity(), MIN_NEXTCLOUD_FILES_APP_VERSION_CODE)) { mSwSingleSignOn.setChecked(false); return; @@ -273,7 +271,7 @@ public class LoginDialogFragment extends DialogFragment { try { AccountImporter.PickNewAccount(LoginDialogFragment.this); } catch (NextcloudFilesAppNotInstalledException e) { - UiExceptionManager.ShowDialogForException(getActivity(), e); + UiExceptionManager.showDialogForException(getActivity(), e); } } else { importedAccount = null; @@ -437,7 +435,7 @@ public class LoginDialogFragment extends DialogFragment { dialogLogin.show(); if(mSwSingleSignOn.isChecked()) { - SingleAccountHelper.SetCurrentAccount(getActivity(), importedAccount); + SingleAccountHelper.setCurrentAccount(getActivity(), importedAccount); } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index f734dc21..be579698 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -447,8 +447,8 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements "https://github.com/nextcloud/news/blob/master/docs/install.md#installing-from-the-app-store"), this); } else { - UiExceptionManager.ShowDialogForException(this, (SSOException) exception); - //UiExceptionManager.ShowNotificationForException(this, (SSOException) exception); + UiExceptionManager.showDialogForException(this, (SSOException) exception); + //UiExceptionManager.showNotificationForException(this, (SSOException) exception); } } else { Toast.makeText(NewsReaderListActivity.this, exception.getLocalizedMessage(), Toast.LENGTH_LONG).show(); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java index 97f94247..1a3655d4 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java @@ -30,8 +30,6 @@ import android.widget.Toast; import com.nextcloud.android.sso.helper.VersionCheckHelper; import com.sothree.slidinguppanel.SlidingUpPanelLayout; -import junit.runner.Version; - import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -56,12 +54,10 @@ import de.luhmer.owncloudnewsreader.model.MediaItem; import de.luhmer.owncloudnewsreader.model.PodcastItem; import de.luhmer.owncloudnewsreader.notification.NextcloudNotificationManager; import de.luhmer.owncloudnewsreader.reader.nextcloud.API_SSO; -import de.luhmer.owncloudnewsreader.services.OwnCloudSyncService; import de.luhmer.owncloudnewsreader.services.PodcastDownloadService; import de.luhmer.owncloudnewsreader.services.PodcastPlaybackService; import de.luhmer.owncloudnewsreader.services.podcast.PlaybackService; import de.luhmer.owncloudnewsreader.ssl.MemorizingTrustManager; -import de.luhmer.owncloudnewsreader.view.PodcastNotification; import de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout; import de.luhmer.owncloudnewsreader.view.ZoomableRelativeLayout; import de.luhmer.owncloudnewsreader.widget.WidgetProvider; @@ -93,7 +89,7 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP ((NewsReaderApplication) getApplication()).getAppComponent().injectActivity(this); if(mApi.getAPI() instanceof API_SSO) { - VersionCheckHelper.VerifyMinVersion(this, MIN_NEXTCLOUD_FILES_APP_VERSION_CODE); + VersionCheckHelper.verifyMinVersion(this, MIN_NEXTCLOUD_FILES_APP_VERSION_CODE); } //Delete all pinned/stored SSL Certificates diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java index efa9c729..1f9d006d 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java @@ -92,7 +92,7 @@ public class ApiProvider { private void initSsoApi(final NextcloudAPI.ApiConnectedListener callback) { try { - Account account = SingleAccountHelper.GetCurrentAccount(context); + Account account = SingleAccountHelper.getCurrentAccount(context); SingleSignOnAccount ssoAccount = AccountImporter.GetAuthTokenInSeparateThread(context, account); NextcloudAPI nextcloudAPI = new NextcloudAPI(context, ssoAccount, GsonConfig.GetGson(), callback); mApi = new API_SSO(nextcloudAPI); -- cgit v1.2.3