Skip to content

Commit 23012c1

Browse files
committed
Changing privileged_users after change user_name
1 parent 257cad1 commit 23012c1

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 21
1010
// API 28 must be frozen for binary execution
1111
targetSdkVersion 28
12-
versionCode 258
12+
versionCode 259
1313
versionName "2.6.0"
1414
vectorDrawables.useSupportLibrary true
1515
}
@@ -31,7 +31,7 @@ android {
3131
}
3232

3333
dependencies {
34-
implementation 'com.google.android.material:material:1.0.0'
34+
implementation 'com.google.android.material:material:1.1.0'
3535
implementation 'androidx.appcompat:appcompat:1.1.0'
3636
implementation 'androidx.browser:browser:1.2.0'
3737
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

app/src/main/java/ru/meefik/linuxdeploy/fragment/PropertiesFragment.java

+7
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,13 @@ private void setSummary(Preference pref, boolean init) {
164164
editPref.setText(PrefStore.generatePassword());
165165
pref.setSummary(editPref.getText());
166166
}
167+
if (editPref.getKey().equals("user_name")) {
168+
String userName = editPref.getText();
169+
String privilegedUsers = getString(R.string.privileged_users).replaceAll("android", userName);
170+
EditTextPreference editPrivilegedUsers = findPreference("privileged_users");
171+
editPrivilegedUsers.setText(privilegedUsers);
172+
editPrivilegedUsers.setSummary(privilegedUsers);
173+
}
167174
}
168175

169176
if (pref instanceof ListPreference) {

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.3'
9+
classpath 'com.android.tools.build:gradle:3.6.1'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Aug 23 00:13:36 MSK 2019
1+
#Sun Mar 01 19:19:59 MSK 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)