diff options
| author | Jelena Petrovic <jelenapetrovic.7119@gmail.com> | 2022-11-06 23:45:09 +0100 |
|---|---|---|
| committer | Jelena Petrovic <jelenapetrovic.7119@gmail.com> | 2022-11-06 23:45:09 +0100 |
| commit | f12280f2396d424ca43893a32939b1b016158b7b (patch) | |
| tree | f57d0e7e24fe2c86bba7346cc7d3a4c91dd277c0 /Client | |
| parent | 37f735cc805d63128263d417f8150e77b4b6272a (diff) | |
| parent | f5b8977e911adf5caba238d624c2668f2a57ba92 (diff) | |
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
Diffstat (limited to 'Client')
| -rw-r--r-- | Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt | 1 | ||||
| -rw-r--r-- | Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt index 9092700..01b3f1d 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt @@ -95,6 +95,7 @@ class FragmentLogin : Fragment() { SharedPreferencesHelper.addValue("jwt",token,activity!!) val intent= Intent(activity!!, NavigationActivity::class.java) startActivity(intent) + activity!!.finish() }else{ if(response.errorBody()!=null) Toast.makeText(activity, response.errorBody()!!.string(), Toast.LENGTH_LONG).show(); diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt index e55da11..0245e9b 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/MainActivity.kt @@ -30,6 +30,7 @@ class MainActivity : AppCompatActivity() { startActivity(intent) + finish() } fun checkLoggedIn():Boolean{ @@ -48,7 +49,6 @@ class MainActivity : AppCompatActivity() { } fun refreshJwt(token:String){ - Log.d("Main","RIPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP") if(token==null) return var refreshJwt= RetrofitHelper.getInstance().refreshJwt("Bearer "+token) |