Skip to content

Commit 4d9c2fe

Browse files
committed
fix bug pages
1 parent 3ed01dd commit 4d9c2fe

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

app/src/main/java/org/openimis/imispolicies/LoginActivity.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,31 @@ public void onClick(View view) {
6565
boolean loggedIn = ca.LoginJI(username, password);
6666
if(loggedIn){
6767
if(page == 0){
68-
Intent intent = new Intent(LoginActivity.this, SyncActivity.class);
69-
startActivity(intent);
68+
finish();
7069
} else if (page == 1) {
70+
progressBar.setVisibility(View.GONE);
7171
Intent intent = new Intent(LoginActivity.this, SearchActivity.class);
7272
startActivity(intent);
73+
finish();
7374
} else if (page == 2) {
75+
progressBar.setVisibility(View.GONE);
7476
Intent intent = new Intent(LoginActivity.this, Enrolment.class);
7577
startActivity(intent);
78+
finish();
7679
} else if (page == 4) {
80+
progressBar.setVisibility(View.GONE);
7781
ca.launchActivity("Reports");
82+
finish();
7883
} else if (page == 5) {
84+
progressBar.setVisibility(View.GONE);
7985
ca.launchActivity("Enquire");
86+
finish();
8087
} else {
88+
progressBar.setVisibility(View.GONE);
8189
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
8290
startActivity(intent);
91+
finish();
8392
}
84-
progressBar.setVisibility(View.GONE);
85-
finish();
8693
} else {
8794
progressDialog.dismiss();
8895
ca.ShowDialog(getResources().getString(R.string.LoginFail));

app/src/main/res/layout/dialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/layout_root"
44
android:layout_width="fill_parent"
5-
android:layout_height="fill_parent"
5+
android:layout_height="wrap_content"
66
android:orientation="vertical"
77
android:padding="10dp" >
88

0 commit comments

Comments
 (0)