Merge branch 'develop' of s416084/find-my-tutor-android into master
This commit is contained in:
commit
261002d131
@ -10,7 +10,7 @@ android {
|
|||||||
applicationId "com.uam.wmi.findmytutor"
|
applicationId "com.uam.wmi.findmytutor"
|
||||||
minSdkVersion 22
|
minSdkVersion 22
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 12
|
versionCode 14
|
||||||
versionName "0.9.1-alpha"
|
versionName "0.9.1-alpha"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
|
Binary file not shown.
@ -232,7 +232,7 @@ public class SharingFragment extends PreferenceFragment {
|
|||||||
lp.setDefaultValue(0);
|
lp.setDefaultValue(0);
|
||||||
lp.setEntryValues(entryValues);
|
lp.setEntryValues(entryValues);
|
||||||
|
|
||||||
if(entries.length > 0)
|
if(entries.length > 0 && activeId != null)
|
||||||
lp.setValueIndex(activeId);
|
lp.setValueIndex(activeId);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user