Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ println("PROJECT_ID: $projectId")
applicationId = "com.resonate.resonate"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdk = flutter.minSdkVersion
minSdk = 23
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode.toInt()
versionName = flutter.versionName
Expand Down
23 changes: 14 additions & 9 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,20 @@ Future<void> main() async {
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
await GetStorage.init();
Get.put(AboutAppScreenController());
languageLocale =
await FlutterSecureStorage().read(key: "languageLocale") ?? "en";
final String? savedModel = await FlutterSecureStorage().read(
key: "whisperModel",
);
currentWhisperModel.value = WhisperModel.values.firstWhere(
(model) => model.modelName == (savedModel ?? "base"),
orElse: () => WhisperModel.base,
);
try {
const storage = FlutterSecureStorage(aOptions: androidOptions);
languageLocale = await storage.read(key: "languageLocale") ?? "en";
final String? savedModel = await storage.read(key: "whisperModel");
currentWhisperModel.value = WhisperModel.values.firstWhere(
(model) => model.modelName == (savedModel ?? "base"),
orElse: () => WhisperModel.base,
);
} catch (e) {
log("SecureStorage init error: $e");
// Fallback defaults
languageLocale = "en";
currentWhisperModel.value = WhisperModel.base;
}
runApp(const MyApp());
}

Expand Down
54 changes: 40 additions & 14 deletions lib/services/room_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,16 @@ class RoomService {
: response["livekit_socket_url"];

// Store Livekit Url and Token in Secure Storage
const storage = FlutterSecureStorage();
await storage.write(key: "createdRoomAdminToken", value: livekitToken);
await storage.write(key: "createdRoomLivekitUrl", value: livekitSocketUrl);
try {
const storage = FlutterSecureStorage(aOptions: androidOptions);
await storage.write(key: "createdRoomAdminToken", value: livekitToken);
await storage.write(
key: "createdRoomLivekitUrl",
value: livekitSocketUrl,
);
} catch (e) {
Get.snackbar("Error", "Failed to save room token: $e");
}

String myDocId = await addParticipantToAppwriteCollection(
roomId: appwriteRoomDocId,
Expand Down Expand Up @@ -137,9 +144,16 @@ class RoomService {
: response["livekit_socket_url"];

// Store Livekit Url and Token in Secure Storage
const storage = FlutterSecureStorage();
await storage.write(key: "createdRoomAdminToken", value: livekitToken);
await storage.write(key: "createdRoomLivekitUrl", value: livekitSocketUrl);
try {
const storage = FlutterSecureStorage(aOptions: androidOptions);
await storage.write(key: "createdRoomAdminToken", value: livekitToken);
await storage.write(
key: "createdRoomLivekitUrl",
value: livekitSocketUrl,
);
} catch (e) {
Get.snackbar("Error", "Failed to save room token: $e");
}

await joinLiveKitRoom(livekitSocketUrl, livekitToken, isLiveChapter: true);

Expand All @@ -161,20 +175,32 @@ class RoomService {
}

static Future deleteLiveChapterRoom({required roomId}) async {
const storage = FlutterSecureStorage();
try {
const storage = FlutterSecureStorage(aOptions: androidOptions);

// Delete room on livekit and roomdoc on appwrite
String? livekitToken = await storage.read(key: "createdRoomAdminToken");
await apiService.deleteLiveChapterRoom(roomId, livekitToken!);
// Delete room on livekit and roomdoc on appwrite
String? livekitToken = await storage.read(key: "createdRoomAdminToken");
if (livekitToken != null) {
await apiService.deleteLiveChapterRoom(roomId, livekitToken);
}
} catch (e) {
print("Error deleting live chapter room: $e");
}
}

static Future deleteRoom({required roomId}) async {
RoomsController roomsController = Get.find<RoomsController>();
const storage = FlutterSecureStorage();
try {
const storage = FlutterSecureStorage(aOptions: androidOptions);

// Delete room on livekit and roomdoc on appwrite
String? livekitToken = await storage.read(key: "createdRoomAdminToken");
await apiService.deleteRoom(roomId, livekitToken!);
// Delete room on livekit and roomdoc on appwrite
String? livekitToken = await storage.read(key: "createdRoomAdminToken");
if (livekitToken != null) {
await apiService.deleteRoom(roomId, livekitToken);
}
} catch (e) {
print("Error deleting room: $e");
}

// Get all participant documents and delete them
RowList participantDocsRef = await roomsController.tablesDB.listRows(
Expand Down
7 changes: 7 additions & 0 deletions lib/utils/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@

// Appwrite Project Constants

import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:get/get.dart';
import 'package:whisper_flutter_new/whisper_flutter_new.dart';

const androidOptions = AndroidOptions(
encryptedSharedPreferences: true,
migrateOnAlgorithmChange: true,
resetOnError: true,
);

const String baseDomain = String.fromEnvironment(
'APPWRITE_BASE_DOMAIN',
defaultValue: '10.12.78.30',
Expand Down
25 changes: 17 additions & 8 deletions lib/views/screens/app_preferences_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@ class _AppPreferencesScreenState extends State<AppPreferencesScreen> {
onValuePicked: (Language language) async {
Get.updateLocale(Locale(language.isoCode));

await FlutterSecureStorage().write(
key: "languageLocale",
value: language.isoCode,
);
try {
await const FlutterSecureStorage(
aOptions: androidOptions,
).write(key: "languageLocale", value: language.isoCode);
} catch (e) {
// log error
}
},
languages: AppLocalizations.supportedLocales
.map((locale) => Language.fromIsoCode(locale.languageCode))
Expand Down Expand Up @@ -207,10 +210,16 @@ class _AppPreferencesScreenState extends State<AppPreferencesScreen> {
onTap: () async {
currentWhisperModel.value = modelData['model'];

await FlutterSecureStorage().write(
key: "whisperModel",
value: modelData['model'].modelName,
);
try {
await const FlutterSecureStorage(
aOptions: androidOptions,
).write(
key: "whisperModel",
value: modelData['model'].modelName,
);
} catch (e) {
// log error
}
},
leading: Container(
padding: EdgeInsets.all(UiSizes.width_10),
Expand Down
Loading