diff options
Diffstat (limited to 'Client')
4 files changed, 18 insertions, 6 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt index 928a128..9cce17f 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt @@ -2,11 +2,12 @@ package com.example.brzodolokacije.Fragments import android.content.Intent import android.os.Bundle -import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Button +import androidx.fragment.app.Fragment +import com.exam.DBHelper import com.example.brzodolokacije.Activities.ActivityLoginRegister import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.SharedPreferencesHelper @@ -55,6 +56,7 @@ class FragmentMyProfileInfo : Fragment() { fun logOut(){ if(SharedPreferencesHelper.removeValue("jwt",requireActivity())) { + DBHelper.getInstance(requireActivity()).deleteDB(); val intent= Intent(requireActivity(), ActivityLoginRegister::class.java) startActivity(intent) requireActivity().finish() diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt index 479b9cb..191df3c 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt @@ -59,7 +59,7 @@ class DBHelper : fun doesTableExist(tableName:String,db: SQLiteDatabase?):Boolean{ if(db!=null){ - var sqlString:String="select DISTINCT tbl_name from sqlite_master where tbl_name = '\"+tableName+\"'" + var sqlString:String="select DISTINCT tbl_name from sqlite_master where tbl_name = '"+tableName+"'" var cursor: Cursor=db.rawQuery(sqlString,null) if(cursor!=null){ if(cursor.count>0){ @@ -78,6 +78,7 @@ class DBHelper : } fun addMessage(message: Message, sent:Boolean=true){ + onCreate(db) if(!message._id.isNullOrEmpty() && message.senderId==message.receiverId){ Log.d("main", "ne zapisuje se dupla poruka") } else { @@ -107,6 +108,7 @@ class DBHelper : } } fun getMessages(userId:String, self:Boolean=false): MutableList<Message>? { + onCreate(db) var sql:String if(!self) sql="SELECT * FROM "+ MESSAGES_TABLE_NAME+" WHERE senderId='"+userId+"' OR receiverId='"+userId+"'" @@ -138,6 +140,7 @@ class DBHelper : } fun getContacts(): MutableList<ChatPreview>? { + onCreate(db) var sql="SELECT * FROM "+ CONTACTS_TABLE_NAME var cursor=db?.rawQuery(sql,null) if(cursor?.count!! >0){ @@ -152,4 +155,11 @@ class DBHelper : } return null } + + fun deleteDB() { + var sql="DROP TABLE IF EXISTS "+ CONTACTS_TABLE_NAME + db?.execSQL(sql) + sql="DROP TABLE IF EXISTS "+ MESSAGES_TABLE_NAME + db?.execSQL(sql) + } }
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt index d091c5d..567271d 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/SignalRListener.kt @@ -15,7 +15,7 @@ import com.microsoft.signalr.HubConnectionState class SignalRListener private constructor(val activity: Activity){ - private var hubConnection:HubConnection + public var hubConnection:HubConnection private var dbHelper:DBHelper init{ dbHelper= DBHelper.getInstance(activity) @@ -31,7 +31,6 @@ class SignalRListener private constructor(val activity: Activity){ MessageReceive::class.java ) hubConnection.start().blockingAwait() - Log.d("main", hubConnection.connectionState.toString()) } diff --git a/Client/BrzoDoLokacije/app/src/main/res/xml/backup_rules.xml b/Client/BrzoDoLokacije/app/src/main/res/xml/backup_rules.xml index fa0f996..83368ad 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/xml/backup_rules.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/xml/backup_rules.xml @@ -8,6 +8,7 @@ <full-backup-content> <!-- <include domain="sharedpref" path="."/> - <exclude domain="sharedpref" path="device.xml"/> ---> + --> + <exclude domain="database" path="."/> + </full-backup-content>
\ No newline at end of file |