From f8abf6155338f7028fa321b52fe595f9786c5f8b Mon Sep 17 00:00:00 2001 From: "marcin.jedynski" Date: Fri, 7 Dec 2018 02:59:01 +0100 Subject: [PATCH 1/3] no misleading values but summary mising on fragment reload --- .../com/uam/wmi/findmytutor/activity/LoginActivity.java | 7 +++++-- .../com/uam/wmi/findmytutor/activity/SharingFragment.java | 7 +++++-- app/src/main/res/layout/pref_sharing.xml | 4 ---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java index 7734dd1..1f144be 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java @@ -21,6 +21,7 @@ import com.auth0.android.jwt.JWT; import com.jakewharton.retrofit2.adapter.rxjava2.HttpException; import com.uam.wmi.findmytutor.R; import com.uam.wmi.findmytutor.model.JwtToken; +import com.uam.wmi.findmytutor.model.LdapUser; import com.uam.wmi.findmytutor.model.User; import com.uam.wmi.findmytutor.model.ValidateUser; import com.uam.wmi.findmytutor.network.ApiClient; @@ -148,8 +149,10 @@ public class LoginActivity extends AppCompatActivity { private void loginProcess(String email, String password) { ValidateUser user = new ValidateUser(email, password); - - disposable.add(ldapService.validate(user) + LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email); +// disposable.add(ldapService.fakeValidate(fakeUser) +// disposable.add(ldapService.validate(user) + disposable.add(ldapService.fakeValidate(fakeUser) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(this::handleResponse, this::handleError)); 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 eb76a2a..1b526a9 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 @@ -66,7 +66,7 @@ public class SharingFragment extends PreferenceFragment { @Override public void onSuccess(List strings) { String[] statusesArray = strings.toArray(new String[strings.size()]); - setListPreferenceData(statusList.getKey(), statusesArray,strings.size() -1); + setListPreferenceData(statusList.getKey(), statusesArray,null); } @Override @@ -120,7 +120,6 @@ public class SharingFragment extends PreferenceFragment { manualLocationButton = (RightButtonPreference) findPreference("manual_location_button"); manualStatus = findPreference("key_manual_status"); statusList = (ListPreference) findPreference("key_status_value"); - statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class); disposable = new CompositeDisposable(); getStatuses(disposable); @@ -128,6 +127,10 @@ public class SharingFragment extends PreferenceFragment { if (PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) { getLocations(disposable); } + Log.d("SHAR TAB", (String) statusList.getSummary()); + Log.d("SHAR TAB",( String) manualLocationList.getSummary()); +// Log.d("SHAR TAB","dupa"); + locationLevelMapping = new HashMap(); locationLevelMapping.put(0, SharingLevel.PRESENCE.toString()); diff --git a/app/src/main/res/layout/pref_sharing.xml b/app/src/main/res/layout/pref_sharing.xml index 0f03421..ff68db0 100644 --- a/app/src/main/res/layout/pref_sharing.xml +++ b/app/src/main/res/layout/pref_sharing.xml @@ -26,8 +26,6 @@ android:title="@string/title_location_level" /> Date: Sat, 8 Dec 2018 10:10:53 +0100 Subject: [PATCH 2/3] mapbox update + acra switch in settings --- app/build.gradle | 6 +++--- .../java/com/uam/wmi/findmytutor/activity/MapActivity.java | 2 +- app/src/main/res/layout/pref_main.xml | 7 +++++++ app/src/main/res/values/strings.xml | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3c500f0..dd0a15f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "com.uam.wmi.findmytutor" minSdkVersion 22 targetSdkVersion 27 - versionCode 1 + versionCode 2 versionName "0.9.2-alpha" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -52,7 +52,8 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.4.0' implementation 'io.swagger:swagger-annotations:1.5.15' implementation 'org.threeten:threetenbp:1.3.5' - implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.6.5' + implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.7.2' + implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.0.0' implementation 'io.reactivex.rxjava2:rxjava:2.2.0' implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' @@ -66,7 +67,6 @@ dependencies { implementation 'com.auth0.android:jwtdecode:1.1.1' implementation 'com.annimon:stream:1.2.1' implementation 'com.google.android.gms:play-services-location:16.0.0' - implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.0.0' // FloatingBarMenu implementation 'com.getbase:floatingactionbutton:1.10.1' implementation 'org.apache.commons:commons-collections4:4.0' diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index d98fa2f..9c6a5f5 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -126,7 +126,6 @@ public class MapActivity extends BaseActivity selectLocationButton = findViewById(R.id.select_location_button); removeLocationButton = findViewById(R.id.remove_location_button); - Mapbox.getInstance(this, getString(R.string.access_token)); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); mapView.getMapAsync(this); @@ -637,6 +636,7 @@ public class MapActivity extends BaseActivity @Override protected int getContentViewId() { + Mapbox.getInstance(this, getString(R.string.access_token)); return R.layout.activity_map; } diff --git a/app/src/main/res/layout/pref_main.xml b/app/src/main/res/layout/pref_main.xml index 131685a..2977f17 100644 --- a/app/src/main/res/layout/pref_main.xml +++ b/app/src/main/res/layout/pref_main.xml @@ -15,5 +15,12 @@ android:summary="%s" android:title="@string/title_language" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a1605b..70b2d71 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -234,9 +234,12 @@ Error handling status fetch Error handling status fetch + Auto reporting on issue is OFF + Auto reporting on issue is ON + ACRA reporting tool Sorry, the application crashed. A report will be sent to the developers Sorry, the application crashed. A report will be sent to the developers - FMT Crash + FMT Issue FMT Lack information about duty hours No note. From 3344449bf41fbf9953e692853286d9ac46920f29 Mon Sep 17 00:00:00 2001 From: Marcin Jedynski Date: Sat, 8 Dec 2018 10:55:53 +0100 Subject: [PATCH 3/3] fixed choosing/viewing values from sharing tab --- .../uam/wmi/findmytutor/activity/SharingFragment.java | 10 +++++++--- .../java/com/uam/wmi/findmytutor/utils/PrefUtils.java | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) 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 1b526a9..692c187 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 @@ -143,6 +143,9 @@ public class SharingFragment extends PreferenceFragment { statusMapping.put(1, "consultation"); statusMapping.put(2, "busy"); + statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext())); + manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext())); +// manualLocationList.setSummary(PrefUtils.getManualLocation(getApplicationContext())); /** Main sharing switch**/ locationSharing.setOnPreferenceChangeListener((buttonView, newValue) -> { PrefUtils.storeEnableSharingLocalization(getApplicationContext(), (Boolean) newValue); @@ -176,11 +179,12 @@ public class SharingFragment extends PreferenceFragment { /** 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); - PrefUtils.putManualLocation(getApplicationContext(), temp.getGeoData(), temp.getApproximatedLocation() ); PrefUtils.putCurrentManualLocation(getApplicationContext(),temp.getPredefinedCoordinateId()); + PrefUtils.putCurrentManualLocationName(getApplicationContext(), (String )lp.getEntries()[Integer.parseInt((String) newValue)]); + lp.setSummary(lp.getEntries()[Integer.parseInt((String) newValue)]); return true; }); @@ -198,7 +202,7 @@ public class SharingFragment extends PreferenceFragment { ListPreference lp = (ListPreference) preference; CharSequence[] entries = lp.getEntries(); PrefUtils.storeStatus(getApplicationContext(), (String) entries[Integer.parseInt((String) newValue)]); - + lp.setSummary(entries[Integer.parseInt((String) newValue)]); return true; }); /** Custom status list change listener **/ diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java index b60ffbc..76e281e 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java @@ -188,5 +188,13 @@ public class PrefUtils { public static String getCurrentManualLocation(Context context) { return getSharedPreferences(context).getString("current_manual_location", null); } + public static void putCurrentManualLocationName(Context context, String locationName) { + SharedPreferences.Editor editor = getSharedPreferences(context).edit(); + editor.putString("current_manual_location_name", locationName); + editor.apply(); + } + public static String getCurrentManualLocationName(Context context) { + return getSharedPreferences(context).getString("current_manual_location_name", null); + } } \ No newline at end of file