From 9525d476002cc33d37b569b41955bd931b917fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Sat, 5 Jan 2019 15:52:56 +0100 Subject: [PATCH] Fix --- .../wmi/findmytutor/activity/BlackList.java | 43 +- .../findmytutor/activity/SharingFragment.java | 372 +++++++++--------- .../wmi/findmytutor/activity/TutorTab.java | 7 +- .../wmi/findmytutor/activity/WhiteList.java | 63 ++- .../utils/WrapContentLinearLayoutManager.java | 8 - app/src/main/res/layout/pref_sharing.xml | 6 +- app/src/main/res/values/array.xml | 9 - 7 files changed, 256 insertions(+), 252 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java index 33603bf..b327a86 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java @@ -86,6 +86,7 @@ public class BlackList extends AppCompatActivity { Switch aSwitch; @BindView(R.id.add_to_black_list_fab) FloatingActionButton addToBlackListFab; + private Integer prevSize; private BlackListAdapter mAdapter; private List blacklistedUsers = new ArrayList<>(); @@ -283,27 +284,6 @@ public class BlackList extends AppCompatActivity { } } - @Override - public void onDestroy() { - super.onDestroy(); - disposable.dispose(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public void onPause() { - super.onPause(); - } - - @Override - public void onStop() { - super.onStop(); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. @@ -358,4 +338,25 @@ public class BlackList extends AppCompatActivity { },this::showError) ); } + + @Override + public void onResume() { + super.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + } + + @Override + public void onStop() { + super.onStop(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + disposable.dispose(); + } } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java index 7fd9047..e742a29 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java @@ -31,8 +31,6 @@ import com.uam.wmi.findmytutor.utils.RestApiHelper; import com.uam.wmi.findmytutor.utils.RightButtonPreference; import com.uam.wmi.findmytutor.utils.SharingLevel; -import org.apache.commons.collections4.BidiMap; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -59,9 +57,9 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere protected RightButtonPreference removeManualStatus; protected Preference manualStatus; protected ListPreference statusList; - private HashMap locationMap; - private ArrayList locationUUIDs; protected List predefinedCoordsList = new ArrayList<>(); + private HashMap locationMap; + private ArrayList locationUUIDs; private HashMap locationLevelMapping; private HashMap statusMapping; private PredefinedStatusesService statusesService; @@ -70,9 +68,9 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere private AlertDialog.Builder builder; private String[] statusesArray; private boolean statusSwitchFlag; - private ArrayList predefinedLocationsList; + private ArrayList predefinedLocationsList; - public static SharingFragment newInstance() { + public static SharingFragment newInstance() { return new SharingFragment(); } @@ -84,12 +82,12 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere .subscribeWith(new DisposableSingleObserver>() { @Override public void onSuccess(List strings) { - statusesArray = strings.toArray(new String[strings.size()]); - if(strings.isEmpty()){ - disableStatusPreferences(); - }else{ - enableStatusPreferences(); - } + statusesArray = strings.toArray(new String[strings.size()]); + if (strings.isEmpty()) { + disableStatusPreferences(); + } else { + enableStatusPreferences(); + } // Log.d("STATUSES",Integer.toString(statusesArray.length )); setListPreferenceData(statusList, statusesArray, null); } @@ -112,45 +110,46 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere public void onSuccess(List coords) { String currentCoordId = PrefUtils.getCurrentManualLocation(getApplicationContext()); - locationMap = new HashMap(); - locationUUIDs = new ArrayList(); - for (PredefinedCoordViewModel i : coords) locationMap.put(i.getPredefinedCoordinateId(),i.getName()); - for (PredefinedCoordViewModel i : coords) locationUUIDs.add(i.getPredefinedCoordinateId()); - List predefinedLocationsNames = Stream.of(coords).map(PredefinedCoordViewModel::getName).toList(); - List predefinedLocationsUUIDs = Stream.of(coords).map(PredefinedCoordViewModel::getPredefinedCoordinateId).toList(); + locationMap = new HashMap(); + locationUUIDs = new ArrayList(); + for (PredefinedCoordViewModel i : coords) + locationMap.put(i.getPredefinedCoordinateId(), i.getName()); + for (PredefinedCoordViewModel i : coords) + locationUUIDs.add(i.getPredefinedCoordinateId()); + List predefinedLocationsNames = Stream.of(coords).map(PredefinedCoordViewModel::getName).toList(); + List predefinedLocationsUUIDs = Stream.of(coords).map(PredefinedCoordViewModel::getPredefinedCoordinateId).toList(); predefinedCoordsList.addAll(coords); String[] stringnames = predefinedLocationsNames.toArray(new String[0]); - predefinedLocationsList = new ArrayList<>(Arrays.asList(stringnames)); - if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) { - preferenceCategory.removePreference(manualLocationList); - preferenceCategory.removePreference(removeManualLocation); - preferenceCategory.removePreference(manualLocationButton); - }else{ - if(predefinedCoordsList.isEmpty()){ - locationSharing.setEnabled(false); - locationSharing.setChecked(false); - PrefUtils.disableSharing(getApplicationContext()); - ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle(); - removeManualLocation.setEnabled(false); - manualLocationList.setEnabled(false); - manualLocationList.setSummary(""); - }else{ - manualLocationList.setEnabled(true); - manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext())); - removeManualLocation.setEnabled(true); - locationSharing.setEnabled(true); + predefinedLocationsList = new ArrayList<>(Arrays.asList(stringnames)); + if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) { + preferenceCategory.removePreference(manualLocationList); + preferenceCategory.removePreference(removeManualLocation); + preferenceCategory.removePreference(manualLocationButton); + } else { + if (predefinedCoordsList.isEmpty()) { + locationSharing.setEnabled(false); + locationSharing.setChecked(false); + PrefUtils.disableSharing(getApplicationContext()); + ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle(); + removeManualLocation.setEnabled(false); + manualLocationList.setEnabled(false); + manualLocationList.setSummary(""); + } else { + manualLocationList.setEnabled(true); + manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext())); + removeManualLocation.setEnabled(true); + locationSharing.setEnabled(true); - } - } + } + } List activesId = Stream.of(coords).indexed() .filter(v -> v.getSecond().getPredefinedCoordinateId().equals(currentCoordId)).map(IntPair::getFirst).toList(); - if( activesId.size() == 0){ + if (activesId.size() == 0) { setListPreferenceData(manualLocationList, stringnames, null); - } - else { + } else { setListPreferenceData(manualLocationList, stringnames, activesId.get(0)); } @@ -180,11 +179,11 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere removeManualStatus = (RightButtonPreference) findPreference("remove_manual_status"); manualStatus = findPreference("key_manual_status"); statusList = (ListPreference) findPreference("key_status_value"); - statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class); - locationService = ApiClient.getClient(getApplicationContext()).create(PredefinedCoordinatesService.class); + statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class); + locationService = ApiClient.getClient(getApplicationContext()).create(PredefinedCoordinatesService.class); disposable = new CompositeDisposable(); statusesArray = new String[0]; - predefinedLocationsList = new ArrayList(); + predefinedLocationsList = new ArrayList(); getStatuses(disposable); getLocations(disposable); locationLevelMapping = new HashMap(); @@ -216,21 +215,21 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere PrefUtils.storeLocationMode(getApplicationContext(), locationLevelMapping.get(Integer.parseInt((String) newValue))); if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) { if (!predefinedCoordsList.isEmpty()) { - preferenceCategory.addPreference(manualLocationList); - preferenceCategory.addPreference(removeManualLocation); - }else{ - locationSharing.setEnabled(false); - locationSharing.setChecked(false); - PrefUtils.disableSharing(getApplicationContext()); - ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle(); + preferenceCategory.addPreference(manualLocationList); + preferenceCategory.addPreference(removeManualLocation); + } else { + locationSharing.setEnabled(false); + locationSharing.setChecked(false); + PrefUtils.disableSharing(getApplicationContext()); + ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle(); } preferenceCategory.addPreference(manualLocationButton); } else { - locationSharing.setEnabled(true); + locationSharing.setEnabled(true); preferenceCategory.removePreference(manualLocationList); preferenceCategory.removePreference(manualLocationButton); - preferenceCategory.removePreference(removeManualLocation); + preferenceCategory.removePreference(removeManualLocation); } return true; }); @@ -240,6 +239,8 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere /** Custom manual location list change listener **/ manualLocationList.setOnPreferenceChangeListener((preference, newValue) -> { + + ListPreference lp = (ListPreference) preference; CharSequence[] entries = lp.getEntries(); PredefinedCoordViewModel temp = Stream.of(predefinedCoordsList).filter(p -> p.getName().equals(lp.getEntries()[Integer.parseInt((String) newValue)].toString())).toList().get(0); @@ -260,7 +261,6 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere }); - /** Button 'choose from map' button listener **/ manualLocationButton.setOnPreferenceChangeListener((preference, o) -> { FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); @@ -269,7 +269,7 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere return true; }); statusSwitch.setOnPreferenceChangeListener((preference, newValue) -> { - return true; + return true; }); /** Status list change listener **/ statusList.setOnPreferenceChangeListener((preference, newValue) -> { @@ -290,38 +290,39 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere return true; }); - removeManualStatus.setOnPreferenceChangeListener((preference, newValue) -> { - showRemoveDialog(statusList.getEntries(),"status"); - return true; - }); - removeManualLocation.setOnPreferenceChangeListener(((preference, newValue) -> { - showRemoveDialog(manualLocationList.getEntries(),"location"); - return true; + removeManualStatus.setOnPreferenceChangeListener((preference, newValue) -> { + showRemoveDialog(statusList.getEntries(), "status"); + return true; + }); + removeManualLocation.setOnPreferenceChangeListener(((preference, newValue) -> { + showRemoveDialog(manualLocationList.getEntries(), "location"); + return true; - })); + })); } - public void showRemoveDialog(CharSequence[] entries, String service){ - boolean [] checked = new boolean[entries.length]; + + public void showRemoveDialog(CharSequence[] entries, String service) { + boolean[] checked = new boolean[entries.length]; ArrayList tobeDeleted = new ArrayList(); // Log.d("sharingDialog", "no to siup"); - builder.setPositiveButton("DELETE", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - for (int i=0; i< entries.length; i++){ - if(checked[i] == true) { - tobeDeleted.add((String) entries[i]); - } - } - removeEntries(service,tobeDeleted); + builder.setPositiveButton("DELETE", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + for (int i = 0; i < entries.length; i++) { + if (checked[i] == true) { + tobeDeleted.add((String) entries[i]); + } + } + removeEntries(service, tobeDeleted); // Log.d("MANAGE-PREF",tobeDeleted.toString()); - } - }); - builder.setMultiChoiceItems(entries, checked, new DialogInterface.OnMultiChoiceClickListener() { - @Override - public void onClick(DialogInterface dialog, int which, boolean isChecked) { + } + }); + builder.setMultiChoiceItems(entries, checked, new DialogInterface.OnMultiChoiceClickListener() { + @Override + public void onClick(DialogInterface dialog, int which, boolean isChecked) { - } - }); + } + }); builder.create().show(); } @@ -333,34 +334,34 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere return view; } - protected void removeEntries(String service, ArrayList toBeDeleted){ + protected void removeEntries(String service, ArrayList toBeDeleted) { // Log.d("MANAGE-PREF", toBeDeleted.toString()); - if(service.equals("status")){ - for (String uuid:toBeDeleted) { - disposable.add(statusesService.deleteUserPredefinedStatus(PrefUtils.getUserId(getApplicationContext()), uuid) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::handleDeleteStatuses, this::handleError)); - } - }else { - ArrayList uuidsToBeDeleted = new ArrayList(); - for (String name:toBeDeleted) { - for (String uuid:locationUUIDs) { - if(locationMap.get(uuid).equals(name)){ - uuidsToBeDeleted.add(uuid); + if (service.equals("status")) { + for (String uuid : toBeDeleted) { + disposable.add(statusesService.deleteUserPredefinedStatus(PrefUtils.getUserId(getApplicationContext()), uuid) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(this::handleDeleteStatuses, this::handleError)); + } + } else { + ArrayList uuidsToBeDeleted = new ArrayList(); + for (String name : toBeDeleted) { + for (String uuid : locationUUIDs) { + if (locationMap.get(uuid).equals(name)) { + uuidsToBeDeleted.add(uuid); + } } - } - } - for (String uuid : uuidsToBeDeleted) { + } + for (String uuid : uuidsToBeDeleted) { // predefinedCoordsList.removeIf(x -> x.getPredefinedCoordinateId().equals(uuid)); - predefinedCoordsList.removeAll(Stream.of(predefinedCoordsList).filter(x -> x.getPredefinedCoordinateId().equals(uuid)).toList()); - disposable.add(locationService.deleteUserPredefinedCoord(PrefUtils.getUserId(getApplicationContext()), uuid) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::handleDeleteLocations, this::handleError)); - } - } + predefinedCoordsList.removeAll(Stream.of(predefinedCoordsList).filter(x -> x.getPredefinedCoordinateId().equals(uuid)).toList()); + disposable.add(locationService.deleteUserPredefinedCoord(PrefUtils.getUserId(getApplicationContext()), uuid) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(this::handleDeleteLocations, this::handleError)); + } + } } protected void setListPreferenceData(ListPreference lp, String[] entries, Integer activeId) { @@ -388,13 +389,13 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere ; private void handleResponse(List resp) { - if(resp.size() == 1){ - enableStatusPreferences(); - if(PrefUtils.isStatusEnabled(getApplicationContext()) == false){ - PrefUtils.enableStatus(getApplicationContext()); - statusSwitch.setChecked(true); - } - } + if (resp.size() == 1) { + enableStatusPreferences(); + if (PrefUtils.isStatusEnabled(getApplicationContext()) == false) { + PrefUtils.enableStatus(getApplicationContext()); + statusSwitch.setChecked(true); + } + } String[] statusesArray = resp.toArray(new String[resp.size()]); setListPreferenceData(statusList, statusesArray, resp.size() - 1); statusList.setValueIndex(resp.size() - 1); @@ -413,79 +414,84 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere "Network error " + error.getMessage(), Toast.LENGTH_SHORT).show(); } } - private void handleDeleteStatuses(List resp){ - if(resp.isEmpty()){ - disableStatusPreferences(); - }else{ - String[] statusesArray = resp.toArray(new String[resp.size()]); - setListPreferenceData(statusList, statusesArray, null); - String currentEntry = PrefUtils.getUserStatus(getApplicationContext()); - if(resp.contains(currentEntry)){ - statusList.setValueIndex(resp.indexOf(currentEntry)); - }else{ - statusList.setValueIndex(0); - statusList.setSummary(resp.get(0)); - } - } - } - private void handleDeleteLocations(List resp){ - getLocations(disposable); - String currentEntry = PrefUtils.getCurrentManualLocation(getApplicationContext()); - if(resp.isEmpty()){ - disableManualLocationPreferences(); - }else{ - if(!Stream.of(resp).filter(x -> x.getName().equals(currentEntry)).toList().isEmpty()) - { - for (PredefinedCoordViewModel location: resp) { - if(location.getName().equals(currentEntry)){ - manualLocationList.setValueIndex(resp.indexOf(location)); - break; - } + private void handleDeleteStatuses(List resp) { + if (resp.isEmpty()) { + disableStatusPreferences(); + } else { + String[] statusesArray = resp.toArray(new String[resp.size()]); + setListPreferenceData(statusList, statusesArray, null); + String currentEntry = PrefUtils.getUserStatus(getApplicationContext()); + if (resp.contains(currentEntry)) { + statusList.setValueIndex(resp.indexOf(currentEntry)); + } else { + statusList.setValueIndex(0); + statusList.setSummary(resp.get(0)); } - }else{ - manualLocationList.setValueIndex(0); - manualLocationList.setSummary(resp.get(0).getName()); - //todo czy na pewno w shared pref sa dobre wartosci - } + } - } - } - private void disableStatusPreferences(){ - removeManualStatus.setEnabled(false); - statusList.setEnabled(false); - statusSwitch.setEnabled(false); - statusList.setSummary(""); - PrefUtils.disableStatus(getApplicationContext()); + } - } - private void enableStatusPreferences(){ - removeManualStatus.setEnabled(true); - statusList.setEnabled(true); - statusSwitch.setEnabled(true); - statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext())); - } - private void disableManualLocationPreferences(){ - removeManualLocation.setEnabled(false); - manualLocationList.setEnabled(false); - manualLocationList.setSummary(""); - locationSharing.setChecked(false); - locationSharing.setEnabled(false); - PrefUtils.disableSharing(getApplicationContext()); - ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle(); - - } - private void enableManualLocationPreferences(){ - removeManualLocation.setEnabled(true); - manualLocationList.setEnabled(true); - - } - - @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - locationSharing.setChecked(PrefUtils.isEnableSharingLocalization(getApplicationContext())); + private void handleDeleteLocations(List resp) { + getLocations(disposable); + String currentEntry = PrefUtils.getCurrentManualLocation(getApplicationContext()); + if (resp.isEmpty()) { + disableManualLocationPreferences(); + } else { + if (!Stream.of(resp).filter(x -> x.getName().equals(currentEntry)).toList().isEmpty()) { + for (PredefinedCoordViewModel location : resp) { + if (location.getName().equals(currentEntry)) { + manualLocationList.setValueIndex(resp.indexOf(location)); + break; + } + } + } else { + manualLocationList.setValueIndex(0); + manualLocationList.setSummary(resp.get(0).getName()); + //todo czy na pewno w shared pref sa dobre wartosci + } } + } + + private void disableStatusPreferences() { + removeManualStatus.setEnabled(false); + statusList.setEnabled(false); + statusSwitch.setEnabled(false); + statusList.setSummary(""); + PrefUtils.disableStatus(getApplicationContext()); + + } + + private void enableStatusPreferences() { + removeManualStatus.setEnabled(true); + statusList.setEnabled(true); + statusSwitch.setEnabled(true); + statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext())); + } + + private void disableManualLocationPreferences() { + removeManualLocation.setEnabled(false); + manualLocationList.setEnabled(false); + manualLocationList.setSummary(""); + locationSharing.setChecked(false); + locationSharing.setEnabled(false); + PrefUtils.disableSharing(getApplicationContext()); + ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle(); + + } + + private void enableManualLocationPreferences() { + removeManualLocation.setEnabled(true); + manualLocationList.setEnabled(true); + + } + + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + locationSharing.setChecked(PrefUtils.isEnableSharingLocalization(getApplicationContext())); + + } @Override public void onResume() { @@ -499,4 +505,10 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this); super.onPause(); } + + @Override + public void onDestroy() { + super.onDestroy(); + disposable.dispose(); + } } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java index 4db2335..1809924 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java @@ -134,7 +134,12 @@ public class TutorTab extends AppCompatActivity { @Override public void onError(Throwable e) { - int code = ((HttpException) e).response().code(); + int code = 0; + + if (e instanceof HttpException) { + code = ((HttpException) e).response().code(); + } + if( code == 404){ ifTutorTabExists = false; dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),new ArrayList()); diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java index 262070a..aad7e70 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java @@ -56,12 +56,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.functions.Function; import io.reactivex.observers.DisposableObserver; -import io.reactivex.observers.DisposableSingleObserver; import io.reactivex.schedulers.Schedulers; import okhttp3.ResponseBody; - - public class WhiteList extends AppCompatActivity { private CompositeDisposable disposable = new CompositeDisposable(); @@ -77,12 +74,12 @@ public class WhiteList extends AppCompatActivity { Switch aSwitch; @BindView(R.id.add_to_white_list_fab) FloatingActionButton addToWhiteListFab; + private WhiteListAdapter mAdapter; private Integer prevSize; private List whitelistedUsers = new ArrayList<>(); private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL")); - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -228,11 +225,12 @@ public class WhiteList extends AppCompatActivity { private void sendUserToWhitelist(String body) { StudentIdModel studentIdModel = new StudentIdModel(body); + disposable.add( - userService.addStudentToWhitelist(PrefUtils.getUserId(getApplicationContext()), studentIdModel) + userService.addStudentToWhitelist(tutorId, studentIdModel) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::handleAddUser,this::showError) + .subscribe(this::handleAddUser,this::showError) ); } @@ -269,32 +267,6 @@ public class WhiteList extends AppCompatActivity { } } - @Override - public void onDestroy() { - super.onDestroy(); - disposable.dispose(); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public void onPause() { - super.onPause(); - } - - @Override - public void onStop() { - super.onStop(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu_white_list, menu); - return true; - } @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -343,4 +315,31 @@ public class WhiteList extends AppCompatActivity { },this::showError) ); } + + @Override + public void onResume() { + super.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + } + + @Override + public void onStop() { + super.onStop(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + disposable.dispose(); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_white_list, menu); + return true; + } } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/WrapContentLinearLayoutManager.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/WrapContentLinearLayoutManager.java index a455adf..e289bda 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/WrapContentLinearLayoutManager.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/WrapContentLinearLayoutManager.java @@ -11,14 +11,6 @@ public class WrapContentLinearLayoutManager extends LinearLayoutManager { super(context); } - public WrapContentLinearLayoutManager(Context context, int orientation, boolean reverseLayout) { - super(context, orientation, reverseLayout); - } - - public WrapContentLinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - @Override public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { try { diff --git a/app/src/main/res/layout/pref_sharing.xml b/app/src/main/res/layout/pref_sharing.xml index b5e64ec..f4e3eb0 100644 --- a/app/src/main/res/layout/pref_sharing.xml +++ b/app/src/main/res/layout/pref_sharing.xml @@ -27,6 +27,8 @@ android:defaultValue="0" android:key="key_manual_location_value" android:summary="%s" + android:entries="@array/manual_location_entries" + android:entryValues="@array/manual_location_values" android:title="@string/title_list_manual_location" /> @string/description_available - @string/description_busy - @string/description_consultation 0 - 1 - 2 @string/assembly_c - @string/assembly_a - @string/passage_d 0 - 1 - 2 - @string/lang_eng @string/lang_pol