mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

allow longer channel names (if you include the # prefix and suffix

pull/276/head^2
Kevin Hester 2021-04-05 15:35:12 +08:00
rodzic 6c8aab5a43
commit 7bb3511587
3 zmienionych plików z 2 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
.idea/vcs.xml
Wyświetl plik

@ -5,6 +5,5 @@
<mapping directory="$PROJECT_DIR$/app/src/main/proto" vcs="Git" /> <mapping directory="$PROJECT_DIR$/app/src/main/proto" vcs="Git" />
<mapping directory="$PROJECT_DIR$/design" vcs="Git" /> <mapping directory="$PROJECT_DIR$/design" vcs="Git" />
<mapping directory="$PROJECT_DIR$/geeksville-androidlib" vcs="Git" /> <mapping directory="$PROJECT_DIR$/geeksville-androidlib" vcs="Git" />
<mapping directory="$PROJECT_DIR$/mesh_shared/src/main/proto" vcs="Git" />
</component> </component>
</project> </project>

2
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
Wyświetl plik

@ -243,7 +243,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
val random = SecureRandom() val random = SecureRandom()
val bytes = ByteArray(32) val bytes = ByteArray(32)
random.nextBytes(bytes) random.nextBytes(bytes)
newSettings.name = newName // Only change the name if the user did some editing newSettings.name = newName
newSettings.psk = ByteString.copyFrom(bytes) newSettings.psk = ByteString.copyFrom(bytes)
} else { } else {
debug("Switching back to default channel") debug("Switching back to default channel")

2
app/src/main/res/layout/channel_fragment.xml
Wyświetl plik

@ -24,7 +24,7 @@
android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890- " android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890- "
android:hint="@string/channel_name" android:hint="@string/channel_name"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:maxLength="11" android:maxLength="15"
android:singleLine="true" android:singleLine="true"
android:text="@string/unset" /> android:text="@string/unset" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>