diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java index aacf9836..163c64d0 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java @@ -28,7 +28,6 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Handler; import android.provider.MediaStore; import android.support.design.widget.Snackbar; import android.view.Menu; @@ -232,7 +231,7 @@ public class DiasporaStreamFragment extends BrowserFragment { protected DiasporaStreamWebChromeClient.SharedTextCallback sharedTextCallback = new DiasporaStreamWebChromeClient.SharedTextCallback() { @Override public String getSharedText() { - if(getActivity() != null) { + if (getActivity() != null) { return ((MainActivity) getActivity()).getTextToBeShared(); } return ""; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index 007eaa7c..ddd1b890 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -311,8 +311,8 @@ public class MainActivity extends ThemedActivity streamFragment.loadUrl(url); } - public void showLastVisitedTimestampMessageIfNeeded(String url){ - if (url.equals(urls.getStreamUrl()) && diasporaUserProfile.hasLastVisitedTimestampInStream()){ + public void showLastVisitedTimestampMessageIfNeeded(String url) { + if (url.equals(urls.getStreamUrl()) && diasporaUserProfile.hasLastVisitedTimestampInStream()) { snackbarLastVisitedTimestampInStream.show(); diasporaUserProfile.resetLastVisitedPositionInStream(); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java index 557593de..a819fc70 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java @@ -153,7 +153,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) { - if(s.equals(getString(R.string.pref_key__screen_rotation))) { + if (s.equals(getString(R.string.pref_key__screen_rotation))) { this.updateScreenRotation(); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java index 3393389b..d9f05a61 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaUserProfile.java @@ -18,7 +18,6 @@ */ package com.github.dfa.diaspora_android.data; -import android.net.ParseException; import android.os.Handler; import com.github.dfa.diaspora_android.App; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/receiver/UpdateTitleReceiver.java b/app/src/main/java/com/github/dfa/diaspora_android/receiver/UpdateTitleReceiver.java index a4cdaca8..e28521ec 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/receiver/UpdateTitleReceiver.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/receiver/UpdateTitleReceiver.java @@ -93,6 +93,7 @@ public class UpdateTitleReceiver extends BroadcastReceiver { public interface TitleCallback { void setTitle(String url, int resId); + void setTitle(String url, String title); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java index f926fd31..99c4833f 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java @@ -158,13 +158,13 @@ public class ThemeHelper { } public static void updateAlertDialogColor(AlertDialog alertDialog) { - if(alertDialog != null) { - for(int i : new int[]{ + if (alertDialog != null) { + for (int i : new int[]{ DialogInterface.BUTTON_POSITIVE, DialogInterface.BUTTON_NEUTRAL, DialogInterface.BUTTON_NEGATIVE}) { Button b = alertDialog.getButton(i); - if(b != null) { + if (b != null) { b.setTextColor(getAccentColor()); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java index 92a83986..3284c406 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppLog.java @@ -61,7 +61,7 @@ public class AppLog { */ public static void v(Object source, String _text) { if (isLoggingEnabled()) { - if(source != null) { + if (source != null) { Log.v(getLogPrefix(source), _text); } else { Log.v("null", _text); @@ -71,7 +71,7 @@ public class AppLog { public static void i(Object source, String _text) { if (isLoggingEnabled()) { - if(source != null) { + if (source != null) { Log.i(getLogPrefix(source), _text); } else { Log.i("null", _text); @@ -81,7 +81,7 @@ public class AppLog { public static void d(Object source, String _text) { if (isLoggingEnabled()) { - if(source != null) { + if (source != null) { Log.d(getLogPrefix(source), _text); } else { Log.d("null", _text); @@ -91,7 +91,7 @@ public class AppLog { public static void e(Object source, String _text) { if (isLoggingEnabled()) { - if(source != null) { + if (source != null) { Log.e(getLogPrefix(source), _text); } else { Log.e("null", _text); @@ -101,7 +101,7 @@ public class AppLog { public static void w(Object source, String _text) { if (isLoggingEnabled()) { - if(source != null) { + if (source != null) { Log.w(getLogPrefix(source), _text); } else { Log.w("null", _text); @@ -111,7 +111,7 @@ public class AppLog { public static void spam(Object source, String _text) { if (isLoggingEnabled() && isLoggingSpamEnabled()) { - if(source != null) { + if (source != null) { Log.v(getLogPrefix(source), _text); } else { Log.v("null", _text); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java index 3f985e64..b4008a7b 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java @@ -21,7 +21,6 @@ import android.content.SharedPreferences; import com.github.dfa.diaspora_android.R; import com.github.dfa.diaspora_android.data.DiasporaAspect; import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod; -import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl; import com.github.dfa.diaspora_android.web.ProxyHandler; import org.json.JSONException; @@ -127,6 +126,7 @@ public class AppSettings { private int getInt(SharedPreferences pref, int ressourceId, int defaultValue) { return pref.getInt(context.getString(ressourceId), defaultValue); } + private long getLong(SharedPreferences pref, int ressourceId, long defaultValue) { return pref.getLong(context.getString(ressourceId), defaultValue); } @@ -413,10 +413,11 @@ public class AppSettings { } - public long getLastVisitedPositionInStream(){ + public long getLastVisitedPositionInStream() { return getLong(prefPod, R.string.pref_key__podprofile_last_stream_position, -1); } - public void setLastVisitedPositionInStream(long timestamp){ + + public void setLastVisitedPositionInStream(long timestamp) { setLong(prefPod, R.string.pref_key__podprofile_last_stream_position, timestamp); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java index bbfb53d1..f9b76cb9 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/DiasporaUrlHelper.java @@ -34,7 +34,7 @@ public class DiasporaUrlHelper { public static final String SUBURL_NOTIFICATIONS = "/notifications"; public static final String SUBURL_POSTS = "/posts/"; public static final String SUBURL_STREAM = "/stream"; - public static final String SUBURL_STREAM_WITH_TIMESTAMP = SUBURL_STREAM+"?max_time="; + public static final String SUBURL_STREAM_WITH_TIMESTAMP = SUBURL_STREAM + "?max_time="; public static final String SUBURL_CONVERSATIONS = "/conversations"; public static final String SUBURL_NEW_POST = "/status_messages/new"; public static final String SUBURL_PEOPLE = "/people/"; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java index 8b1766d7..38ab0f69 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java @@ -153,8 +153,9 @@ public class Helpers { /** * Send an Intent that opens url in any browser + * * @param context context - * @param url url + * @param url url */ public static void openInExternalBrowser(Context context, String url) { Intent openBrowserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java index 3ce1a338..e8da255a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java @@ -260,7 +260,7 @@ public class BrowserFragment extends ThemedFragment { @Override public void onAttach(Context context) { super.onAttach(context); - if(webView != null && webView.getContext() instanceof MutableContextWrapper) { + if (webView != null && webView.getContext() instanceof MutableContextWrapper) { ((MutableContextWrapper) webView.getContext()).setBaseContext(context); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java index 0edd7079..d06556d4 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/DiasporaStreamWebChromeClient.java @@ -19,7 +19,6 @@ package com.github.dfa.diaspora_android.web; import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; import android.webkit.JsResult; import android.webkit.WebView; import android.widget.ProgressBar; @@ -66,18 +65,14 @@ public class DiasporaStreamWebChromeClient extends FileUploadWebChromeClient { builder.setTitle(view.getContext().getString(R.string.confirmation)) .setMessage(message) .setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int which) - { + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { result.confirm(); } }) .setNegativeButton(android.R.string.cancel, - new DialogInterface.OnClickListener() - { - public void onClick(DialogInterface dialog, int which) - { + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { result.cancel(); } })