Skip to content

Commit

Permalink
Merge pull request #307 from opeolluwa/master
Browse files Browse the repository at this point in the history
new patch 0.7.3
  • Loading branch information
opeolluwa authored May 10, 2024
2 parents 9c4aead + 3ac2907 commit c39c532
Show file tree
Hide file tree
Showing 140 changed files with 4,276 additions and 7,609 deletions.
129 changes: 125 additions & 4 deletions core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ pnet = "0.34.0"
open = "5.1.2"
path-absolutize = "3.1.1"
fs_extra = "1.3.0"
wifidirect-legacy-ap = "0.4.0"
aes-gcm = "0.10.3"
sha2 = "0.10.8"
rand = "0.8.5"
[features]
# this feature is used for production builds or when `devPath` points to the filesystem
# DO NOT REMOVE!!
Expand Down
10 changes: 10 additions & 0 deletions core/bindings/State.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { Settings } from "./Settings";
import type { SystemInformation } from "./SystemInformation";
import type { TransferHistory } from "./TransferHistory";

export interface State {
settings: Settings;
transfer_history: Array<TransferHistory>;
system_information: SystemInformation;
}
66 changes: 0 additions & 66 deletions core/src/api/wifi.rs

This file was deleted.

3 changes: 2 additions & 1 deletion core/src/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use sqlx::{
};
use ts_rs::TS;
use uuid::Uuid;

pub struct Database;
#[allow(unused)]

Expand All @@ -31,7 +32,7 @@ impl Database {
/* create the settings table, the table will contain user preference and settings */
//TODO: add device name , device_name VARCHAR
let settings_table =
"CREATE TABLE IF NOT EXISTS settings ( id INTEGER PRIMARY KEY DEFAULT 1, language VARCHAR, theme VARCHAR)";
"CREATE TABLE IF NOT EXISTS settings (id INTEGER PRIMARY KEY DEFAULT 1, language VARCHAR, theme VARCHAR)";

let db = SqlitePool::connect(&DB_URL).await.unwrap();
let _ = sqlx::query(file_history_table).execute(&db).await.unwrap();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c39c532

Please sign in to comment.