mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-04 01:59:35 +00:00
avoid warnings, formatting some code
This commit is contained in:
1 parent
ef7fe75772
commit
ffd116e5fc
7 files changed
+40
-48
No files matched your search
-2
@@ -18,8 +18,6 @@ import com.sap.sailing.android.tracking.app.R;
|
||||
import com.sap.sailing.android.tracking.app.utils.AppPreferences;
|
||||
import com.sap.sailing.android.tracking.app.utils.SqlDebugHelper;
|
||||
|
||||
import com.sap.sailing.android.shared.ui.activities.SendingServiceAwareActivity;
|
||||
|
||||
public class BaseActivity extends SendingServiceAwareActivity {
|
||||
private static final String TAG = BaseActivity.class.getName();
|
||||
|
||||
|
||||
+40
-40
@@ -16,52 +16,52 @@ import com.sap.sailing.android.tracking.app.R;
|
||||
import com.sap.sailing.android.tracking.app.ui.activities.LeaderboardWebViewActivity;
|
||||
|
||||
public class LeaderboardFragment extends BaseFragment {
|
||||
|
||||
private static final String TAG = LeaderboardFragment.class.getName();
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
super.onCreateView(inflater, container, savedInstanceState);
|
||||
private static final String TAG = LeaderboardFragment.class.getName();
|
||||
|
||||
View view = inflater.inflate(R.layout.fragment_leaderboard, container, false);
|
||||
return view;
|
||||
}
|
||||
|
||||
@SuppressLint("SetJavaScriptEnabled")
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
|
||||
WebView webview = (WebView)getActivity().findViewById(R.id.web_view);
|
||||
|
||||
WebSettings webSettings = webview.getSettings();
|
||||
webSettings.setJavaScriptEnabled(true);
|
||||
|
||||
webview.setWebViewClient(new WebViewClient() {
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
super.onCreateView(inflater, container, savedInstanceState);
|
||||
|
||||
View view = inflater.inflate(R.layout.fragment_leaderboard, container, false);
|
||||
return view;
|
||||
}
|
||||
|
||||
@SuppressLint("SetJavaScriptEnabled")
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
|
||||
WebView webview = (WebView) getActivity().findViewById(R.id.web_view);
|
||||
|
||||
WebSettings webSettings = webview.getSettings();
|
||||
webSettings.setJavaScriptEnabled(true);
|
||||
|
||||
webview.setWebViewClient(new WebViewClient() {
|
||||
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
|
||||
Toast.makeText(getActivity(), description, Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
|
||||
try {
|
||||
String url = getLeaderboardURL();
|
||||
webview.loadUrl(url);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
LeaderboardWebViewActivity activity = (LeaderboardWebViewActivity)getActivity();
|
||||
activity.showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
|
||||
ExLog.e(getActivity(), TAG, "UnsupportedEncodingException when creating leaderboard-url: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
private String getLeaderboardURL() throws UnsupportedEncodingException
|
||||
{
|
||||
LeaderboardWebViewActivity activity = (LeaderboardWebViewActivity)getActivity();
|
||||
String eventId = URLEncoder.encode(activity.eventId, "UTF-8");
|
||||
String leaderboardName = URLEncoder.encode(activity.leaderboardName, "UTF-8");
|
||||
String serverUrl = activity.serverUrl;
|
||||
|
||||
String formatString = "%s/gwt/Leaderboard.html?name=%s" +
|
||||
"&showRaceDetails=false&embedded=true&hideToolbar=true";
|
||||
try {
|
||||
String url = getLeaderboardURL();
|
||||
webview.loadUrl(url);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
LeaderboardWebViewActivity activity = (LeaderboardWebViewActivity) getActivity();
|
||||
activity.showErrorPopup(R.string.error, R.string.error_could_not_complete_operation_on_server_try_again);
|
||||
ExLog.e(getActivity(), TAG, "UnsupportedEncodingException when creating leaderboard-url: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
private String getLeaderboardURL() throws UnsupportedEncodingException {
|
||||
LeaderboardWebViewActivity activity = (LeaderboardWebViewActivity) getActivity();
|
||||
// TODO When using an event-based leaderboard place again, the event's ID can be obtained like this:
|
||||
// String eventId = URLEncoder.encode(activity.eventId, "UTF-8");
|
||||
String leaderboardName = URLEncoder.encode(activity.leaderboardName, "UTF-8");
|
||||
String serverUrl = activity.serverUrl;
|
||||
|
||||
String formatString = "%s/gwt/Leaderboard.html?name=%s"
|
||||
+ "&showRaceDetails=false&embedded=true&hideToolbar=true";
|
||||
return String.format(formatString, serverUrl, leaderboardName);
|
||||
}
|
||||
}
|
||||
}
|
||||
-1
@@ -5,7 +5,6 @@ import android.os.Bundle;
|
||||
import android.preference.Preference;
|
||||
import android.preference.SwitchPreference;
|
||||
|
||||
import com.sap.sailing.android.shared.logging.ExLog;
|
||||
import com.sap.sailing.android.shared.ui.fragments.preference.BasePreferenceFragment;
|
||||
import com.sap.sailing.android.tracking.app.R;
|
||||
import com.sap.sailing.android.tracking.app.utils.AppPreferences;
|
||||
|
||||
-1
@@ -540,7 +540,6 @@ public class CirclePageIndicator extends View implements PageIndicator {
|
||||
dest.writeInt(currentPage);
|
||||
}
|
||||
|
||||
@SuppressWarnings("UnusedDeclaration")
|
||||
public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
|
||||
@Override
|
||||
public SavedState createFromParcel(Parcel in) {
|
||||
|
||||
-2
@@ -27,7 +27,6 @@ import android.support.v4.view.MotionEventCompat;
|
||||
import android.support.v4.view.ViewConfigurationCompat;
|
||||
import android.support.v4.view.ViewPager;
|
||||
import android.util.AttributeSet;
|
||||
import android.util.FloatMath;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewConfiguration;
|
||||
@@ -434,7 +433,6 @@ public class LinePageIndicator extends View implements PageIndicator {
|
||||
dest.writeInt(currentPage);
|
||||
}
|
||||
|
||||
@SuppressWarnings("UnusedDeclaration")
|
||||
public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
|
||||
@Override
|
||||
public SavedState createFromParcel(Parcel in) {
|
||||
|
||||
-1
@@ -848,7 +848,6 @@ public class TitlePageIndicator extends View implements PageIndicator {
|
||||
dest.writeInt(currentPage);
|
||||
}
|
||||
|
||||
@SuppressWarnings("UnusedDeclaration")
|
||||
public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
|
||||
@Override
|
||||
public SavedState createFromParcel(Parcel in) {
|
||||
|
||||
-1
@@ -388,7 +388,6 @@ public class UnderlinePageIndicator extends View implements PageIndicator {
|
||||
dest.writeInt(currentPage);
|
||||
}
|
||||
|
||||
@SuppressWarnings("UnusedDeclaration")
|
||||
public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
|
||||
@Override
|
||||
public SavedState createFromParcel(Parcel in) {
|
||||
|
||||
Reference in new issue
Block a user