Commit e863eae4 authored by Varun Patil's avatar Varun Patil

Fix codacy issues

parent f98ae2cb
...@@ -29,7 +29,7 @@ import app.insti.notifications.NotificationId; ...@@ -29,7 +29,7 @@ import app.insti.notifications.NotificationId;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
public class InstiAppFirebaseMessagingService extends FirebaseMessagingService { public class InstiAppFirebaseMessagingService extends FirebaseMessagingService {
String channel; private String channel;
@Override @Override
public void onNewToken(String s) { public void onNewToken(String s) {
......
...@@ -12,8 +12,6 @@ import android.webkit.WebView; ...@@ -12,8 +12,6 @@ import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.tasks.OnSuccessListener; import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.iid.FirebaseInstanceId; import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.InstanceIdResult; import com.google.firebase.iid.InstanceIdResult;
...@@ -31,7 +29,6 @@ import retrofit2.Response; ...@@ -31,7 +29,6 @@ import retrofit2.Response;
public class LoginActivity extends AppCompatActivity { public class LoginActivity extends AppCompatActivity {
private static final String TAG = "LoginActivity"; private static final String TAG = "LoginActivity";
private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
private final String redirectUri = "https://redirecturi"; private final String redirectUri = "https://redirecturi";
private final String guestUri = "https://guesturi"; private final String guestUri = "https://guesturi";
public String authCode = null; public String authCode = null;
......
...@@ -573,6 +573,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -573,6 +573,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
SettingsFragment settingsFragment = new SettingsFragment(); SettingsFragment settingsFragment = new SettingsFragment();
updateFragment(settingsFragment); updateFragment(settingsFragment);
break; break;
default:
break;
} }
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
...@@ -685,13 +688,11 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -685,13 +688,11 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
} }
public boolean createEventAccess() { public boolean createEventAccess() {
if (currentUser == null || currentUser.getUserRoles() == null || currentUser.getUserRoles().size() == 0) return (currentUser != null && currentUser.getUserRoles() != null && currentUser.getUserRoles().size() > 0);
return false;
return true;
} }
public boolean editEventAccess(Event event) { public boolean editEventAccess(Event event) {
if (currentUser == null || currentUser.getUserRoles() == null || currentUser.getUserRoles().size() == 0) if (!createEventAccess())
return false; return false;
for (Role role : currentUser.getUserRoles()) { for (Role role : currentUser.getUserRoles()) {
...@@ -708,7 +709,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -708,7 +709,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
} }
public boolean editBodyAccess(Body toEditBody) { public boolean editBodyAccess(Body toEditBody) {
if (currentUser == null || currentUser.getUserRoles() == null || currentUser.getUserRoles().size() == 0) if (!createEventAccess())
return false; return false;
for (Role role : currentUser.getUserRoles()) { for (Role role : currentUser.getUserRoles()) {
......
...@@ -73,7 +73,6 @@ public class NewsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i ...@@ -73,7 +73,6 @@ public class NewsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i
} else { } else {
LayoutInflater inflater = LayoutInflater.from(context); LayoutInflater inflater = LayoutInflater.from(context);
View loadView = inflater.inflate(R.layout.blog_load_item, parent, false); View loadView = inflater.inflate(R.layout.blog_load_item, parent, false);
final NewsAdapter.ViewHolder postViewHolder = new NewsAdapter.ViewHolder(loadView);
return new NewsAdapter.ProgressViewHolder(loadView); return new NewsAdapter.ProgressViewHolder(loadView);
} }
} }
......
...@@ -60,7 +60,6 @@ public class PlacementBlogAdapter extends RecyclerView.Adapter<RecyclerView.View ...@@ -60,7 +60,6 @@ public class PlacementBlogAdapter extends RecyclerView.Adapter<RecyclerView.View
} else { } else {
LayoutInflater inflater = LayoutInflater.from(context); LayoutInflater inflater = LayoutInflater.from(context);
View loadView = inflater.inflate(R.layout.blog_load_item, parent, false); View loadView = inflater.inflate(R.layout.blog_load_item, parent, false);
final PlacementBlogAdapter.ViewHolder postViewHolder = new PlacementBlogAdapter.ViewHolder(loadView);
return new PlacementBlogAdapter.ProgressViewHolder(loadView); return new PlacementBlogAdapter.ProgressViewHolder(loadView);
} }
} }
......
...@@ -10,9 +10,12 @@ import android.view.LayoutInflater; ...@@ -10,9 +10,12 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.api.model.User; import app.insti.api.model.User;
......
package app.insti.api; package app.insti.api;
import android.util.Log; import android.util.Log;
import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapView; import com.google.android.gms.maps.MapView;
......
package app.insti.api.model; package app.insti.api.model;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.util.List; import java.util.List;
/** /**
......
...@@ -27,6 +27,7 @@ import com.google.gson.Gson; ...@@ -27,6 +27,7 @@ import com.google.gson.Gson;
import app.insti.Constants; import app.insti.Constants;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.api.EmptyCallback;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.Body; import app.insti.api.model.Body;
import app.insti.api.model.Event; import app.insti.api.model.Event;
...@@ -194,17 +195,13 @@ public class AddEventFragment extends BaseFragment { ...@@ -194,17 +195,13 @@ public class AddEventFragment extends BaseFragment {
url = url.substring(url.lastIndexOf("/") + 1); url = url.substring(url.lastIndexOf("/") + 1);
RetrofitInterface retrofitInterface = Utils.getRetrofitInterface(); RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.getBody(Utils.getSessionIDHeader(), url).enqueue(new Callback<Body>() { retrofitInterface.getBody(Utils.getSessionIDHeader(), url).enqueue(new EmptyCallback<Body>() {
@Override @Override
public void onResponse(Call<Body> call, Response<Body> response) { public void onResponse(Call<Body> call, Response<Body> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
openBody(response.body()); openBody(response.body());
} }
} }
@Override
public void onFailure(Call<Body> call, Throwable t) {
}
}); });
return true; return true;
......
...@@ -47,7 +47,6 @@ import app.insti.api.model.Venter; ...@@ -47,7 +47,6 @@ import app.insti.api.model.Venter;
import app.insti.api.request.CommentCreateRequest; import app.insti.api.request.CommentCreateRequest;
import app.insti.utils.DateTimeUtil; import app.insti.utils.DateTimeUtil;
import de.hdodenhof.circleimageview.CircleImageView; import de.hdodenhof.circleimageview.CircleImageView;
import me.relex.circleindicator.CircleIndicator; import me.relex.circleindicator.CircleIndicator;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
......
...@@ -11,7 +11,9 @@ import android.view.LayoutInflater; ...@@ -11,7 +11,9 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import java.util.List; import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.adapter.ComplaintsAdapter; import app.insti.adapter.ComplaintsAdapter;
......
...@@ -11,7 +11,9 @@ import android.view.LayoutInflater; ...@@ -11,7 +11,9 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import java.util.List; import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.adapter.ComplaintsAdapter; import app.insti.adapter.ComplaintsAdapter;
......
...@@ -134,7 +134,6 @@ public class MapFragment extends Fragment implements TextWatcher, ...@@ -134,7 +134,6 @@ public class MapFragment extends Fragment implements TextWatcher,
private ExpandableListAdapter expAdapter; private ExpandableListAdapter expAdapter;
private FragmentManager fragmentManager; private FragmentManager fragmentManager;
private ListFragment listFragment; private ListFragment listFragment;
private Fragment fragment;
private RelativeLayout fragmentContainer; private RelativeLayout fragmentContainer;
private List<Marker> markerlist; private List<Marker> markerlist;
private SlidingUpPanelLayout slidingLayout; private SlidingUpPanelLayout slidingLayout;
...@@ -347,10 +346,6 @@ public class MapFragment extends Fragment implements TextWatcher, ...@@ -347,10 +346,6 @@ public class MapFragment extends Fragment implements TextWatcher,
} }
} }
private void setupMap() {
setupMap(null);
}
private void setupMap(String initalMarkerName) { private void setupMap(String initalMarkerName) {
if (getView() == null) { if (getView() == null) {
return; return;
...@@ -516,7 +511,6 @@ public class MapFragment extends Fragment implements TextWatcher, ...@@ -516,7 +511,6 @@ public class MapFragment extends Fragment implements TextWatcher,
private void putFragment(Fragment tempFragment) { private void putFragment(Fragment tempFragment) {
this.dismissCard(); this.dismissCard();
transaction = fragmentManager.beginTransaction(); transaction = fragmentManager.beginTransaction();
fragment = tempFragment;
if (noFragments) { if (noFragments) {
transaction.add(R.id.fragment_container, tempFragment); transaction.add(R.id.fragment_container, tempFragment);
transaction.addToBackStack(firstStackTag); transaction.addToBackStack(firstStackTag);
...@@ -872,8 +866,10 @@ public class MapFragment extends Fragment implements TextWatcher, ...@@ -872,8 +866,10 @@ public class MapFragment extends Fragment implements TextWatcher,
} }
if (text == null) { if (text == null) {
return;
}
} else if (text.equals("")) { if (text.equals("")) {
this.setOldText(); this.setOldText();
} else { } else {
editText.setText(text); editText.setText(text);
...@@ -896,11 +892,6 @@ public class MapFragment extends Fragment implements TextWatcher, ...@@ -896,11 +892,6 @@ public class MapFragment extends Fragment implements TextWatcher,
} }
} }
private boolean handleRemoveIcon() {
String text = editText.getText().toString();
return !text.isEmpty();
}
@Override @Override
public void onFocusChange(View v, boolean focus) { public void onFocusChange(View v, boolean focus) {
this.editTextFocused = focus; this.editTextFocused = focus;
......
...@@ -58,7 +58,7 @@ public class NewsFragment extends RecyclerViewFragment<NewsArticle, NewsAdapter> ...@@ -58,7 +58,7 @@ public class NewsFragment extends RecyclerViewFragment<NewsArticle, NewsAdapter>
} }
@Override @Override
Call<List<NewsArticle>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) { protected Call<List<NewsArticle>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) {
return retrofitInterface.getNews(sessionIDHeader, postCount, 20, searchQuery); return retrofitInterface.getNews(sessionIDHeader, postCount, 20, searchQuery);
} }
} }
...@@ -59,7 +59,7 @@ public class PlacementBlogFragment extends RecyclerViewFragment<PlacementBlogPos ...@@ -59,7 +59,7 @@ public class PlacementBlogFragment extends RecyclerViewFragment<PlacementBlogPos
} }
@Override @Override
Call<List<PlacementBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) { protected Call<List<PlacementBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) {
return retrofitInterface.getPlacementBlogFeed(sessionIDHeader, postCount, 20, searchQuery); return retrofitInterface.getPlacementBlogFeed(sessionIDHeader, postCount, 20, searchQuery);
} }
} }
...@@ -39,7 +39,7 @@ public abstract class RecyclerViewFragment<T extends Clickable, S extends Recycl ...@@ -39,7 +39,7 @@ public abstract class RecyclerViewFragment<T extends Clickable, S extends Recycl
protected SwipeRefreshLayout swipeRefreshLayout; protected SwipeRefreshLayout swipeRefreshLayout;
protected String searchQuery; protected String searchQuery;
private S adapter = null; private S adapter = null;
boolean loading = false; private boolean loading = false;
private boolean allLoaded = false; private boolean allLoaded = false;
private String initId = null; private String initId = null;
...@@ -86,7 +86,7 @@ public abstract class RecyclerViewFragment<T extends Clickable, S extends Recycl ...@@ -86,7 +86,7 @@ public abstract class RecyclerViewFragment<T extends Clickable, S extends Recycl
}); });
} }
abstract Call<List<T>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount); protected abstract Call<List<T>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount);
private void displayData(final List<T> result) { private void displayData(final List<T> result) {
/* Skip if we're already destroyed */ /* Skip if we're already destroyed */
......
...@@ -59,7 +59,7 @@ public class TrainingBlogFragment extends RecyclerViewFragment<TrainingBlogPost, ...@@ -59,7 +59,7 @@ public class TrainingBlogFragment extends RecyclerViewFragment<TrainingBlogPost,
} }
@Override @Override
Call<List<TrainingBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) { protected Call<List<TrainingBlogPost>> getCall(RetrofitInterface retrofitInterface, String sessionIDHeader, int postCount) {
return retrofitInterface.getTrainingBlogFeed(sessionIDHeader, postCount, 20, searchQuery); return retrofitInterface.getTrainingBlogFeed(sessionIDHeader, postCount, 20, searchQuery);
} }
} }
...@@ -3,7 +3,6 @@ package com.mrane.campusmap; ...@@ -3,7 +3,6 @@ package com.mrane.campusmap;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Resources;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
public class SettingsManager implements OnSharedPreferenceChangeListener { public class SettingsManager implements OnSharedPreferenceChangeListener {
...@@ -15,7 +14,6 @@ public class SettingsManager implements OnSharedPreferenceChangeListener { ...@@ -15,7 +14,6 @@ public class SettingsManager implements OnSharedPreferenceChangeListener {
public SettingsManager(Context context) { public SettingsManager(Context context) {
sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
sharedPrefs.registerOnSharedPreferenceChangeListener(this); sharedPrefs.registerOnSharedPreferenceChangeListener(this);
Resources res = context.getResources();
muteKey = "mute"; muteKey = "mute";
residencesKey = "residences"; residencesKey = "residences";
lastUpdatedKey = "lastupdated"; lastUpdatedKey = "lastupdated";
......
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto" xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cardView" android:id="@+id/cardView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/white" android:background="@android:color/white"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment