Skip to content

Fix Settings NPE and add RAR password visibility toggle #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blue-B-code wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix Settings NPE and add RAR password visibility toggle #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public class SettingsActivity extends ImisActivity {
EditText etRarPassword;
private String salt, password;
public static String generatedSalt;
Global global;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down
20 changes: 13 additions & 7 deletions claimManagement/src/main/res/layout/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
Expand All @@ -14,15 +15,20 @@
android:layout_marginTop="10dp"
android:text="@string/RarPassword" />

<EditText
android:id="@+id/rarPassword"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="10dp"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:inputType="textPassword">
</EditText>
app:endIconMode="password_toggle">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/rarPassword"
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="10dp"
android:inputType="textPassword|textNoSuggestions" />
</com.google.android.material.textfield.TextInputLayout>

<LinearLayout android:id="@+id/llSaveRarButton"
android:layout_width="match_parent"
Expand Down Expand Up @@ -61,4 +67,4 @@
android:text="@string/SaveRarPassword" />
</LinearLayout>

</LinearLayout>
</LinearLayout>
Loading