0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

APK download: Switch to direct download option

Browse source
This commit is contained in:
Neeraj Gupta 2023-09-04 09:42:27 +05:30
parent 9d95bd16cd
commit 8cbba78bcb
4 changed files with 48 additions and 218 deletions

2
android/build.gradle
View file

@ -24,6 +24,6 @@ subprojects {
project.evaluationDependsOn(':app')
}
task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}

4
lib/l10n/arb/app_en.arb
View file

@ -253,7 +253,9 @@
"privacy": "Privacy",
"terms": "Terms",
"checkForUpdates": "Check for updates",
"installManually": "Install manually",
"downloadUpdate": "Download",
"criticalUpdateAvailable": "Critical update available",
"updateAvailable": "Update available",
"update": "Update",
"checking": "Checking...",
"youAreOnTheLatestVersion": "You are on the latest version",

170
lib/store/offline_authenticator_db.dart
View file

@ -1,170 +0,0 @@
import 'dart:async';
import 'dart:io';
import 'package:ente_auth/models/authenticator/auth_entity.dart';
import 'package:ente_auth/models/authenticator/local_auth_entity.dart';
import 'package:flutter/foundation.dart';
import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
import 'package:sqflite/sqflite.dart';
class OfflineAuthenticatorDB {
static const _databaseName = "ente.offline_authenticator.db";
static const _databaseVersion = 1;
static const entityTable = 'entities';
OfflineAuthenticatorDB._privateConstructor();
static final OfflineAuthenticatorDB instance = OfflineAuthenticatorDB._privateConstructor();
static Future<Database>? _dbFuture;
Future<Database> get database async {
_dbFuture ??= _initDatabase();
return _dbFuture!;
}
Future<Database> _initDatabase() async {
final Directory documentsDirectory =
await getApplicationDocumentsDirectory();
final String path = join(documentsDirectory.path, _databaseName);
debugPrint(path);
return await openDatabase(
path,
version: _databaseVersion,
onCreate: _onCreate,
);
}
Future _onCreate(Database db, int version) async {
await db.execute(
'''
CREATE TABLE $entityTable (
_generatedID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
id TEXT,
encryptedData TEXT NOT NULL,
header TEXT NOT NULL,
createdAt INTEGER NOT NULL,
updatedAt INTEGER NOT NULL,
shouldSync INTEGER DEFAULT 0,
UNIQUE(id)
);
''',
);
}
Future<int> insert(String encData, String header) async {
final db = await instance.database;
final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
final insertedID = await db.insert(
entityTable,
{
"encryptedData": encData,
"header": header,
"shouldSync": 1,
"createdAt": timeInMicroSeconds,
"updatedAt": timeInMicroSeconds,
},
);
return insertedID;
}
Future<int> updateEntry(
int generatedID,
String encData,
String header,
) async {
final db = await instance.database;
final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
int affectedRows = await db.update(
entityTable,
{
"encryptedData": encData,
"header": header,
"shouldSync": 1,
"updatedAt": timeInMicroSeconds,
},
where: '_generatedID = ?',
whereArgs: [generatedID],
);
return affectedRows;
}
Future<void> insertOrReplace(List<AuthEntity> authEntities) async {
final db = await instance.database;
final batch = db.batch();
for (AuthEntity authEntity in authEntities) {
final insertRow = authEntity.toMap();
insertRow.remove('isDeleted');
insertRow.putIfAbsent('shouldSync', () => 0);
batch.insert(
entityTable,
insertRow,
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
await batch.commit(noResult: true);
}
Future<void> updateLocalEntity(LocalAuthEntity localAuthEntity) async {
final db = await instance.database;
await db.update(
entityTable,
localAuthEntity.toMap(),
where: '_generatedID = ?',
whereArgs: [localAuthEntity.generatedID],
conflictAlgorithm: ConflictAlgorithm.replace,
);
}
Future<LocalAuthEntity?> getEntryByID(int genID) async {
final db = await instance.database;
final rows = await db
.query(entityTable, where: '_generatedID = ?', whereArgs: [genID]);
final listOfAuthEntities = _convertRows(rows);
if (listOfAuthEntities.isEmpty) {
return null;
} else {
return listOfAuthEntities.first;
}
}
Future<List<LocalAuthEntity>> getAll() async {
final db = await instance.database;
final rows = await db.rawQuery("SELECT * from $entityTable");
return _convertRows(rows);
}
// deleteByID will prefer generated id if both ids are passed during deletion
Future<void> deleteByIDs({List<int>? generatedIDs, List<String>? ids}) async {
final db = await instance.database;
final batch = db.batch();
const whereGenID = '_generatedID = ?';
const whereID = 'id = ?';
if (generatedIDs != null) {
for (int genId in generatedIDs) {
batch.delete(entityTable, where: whereGenID, whereArgs: [genId]);
}
}
if (ids != null) {
for (String id in ids) {
batch.delete(entityTable, where: whereID, whereArgs: [id]);
}
}
final result = await batch.commit();
debugPrint("Done");
}
Future<void> clearTable() async {
final db = await instance.database;
await db.delete(entityTable);
}
List<LocalAuthEntity> _convertRows(List<Map<String, dynamic>> rows) {
final keys = <LocalAuthEntity>[];
for (final row in rows) {
keys.add(LocalAuthEntity.fromMap(row));
}
return keys;
}
}

90
lib/ui/settings/app_update_dialog.dart
View file

@ -1,10 +1,11 @@
import 'dart:io';
import 'package:ente_auth/core/configuration.dart';
import 'package:ente_auth/core/network.dart';
import 'package:ente_auth/ente_theme_data.dart';
import 'package:ente_auth/l10n/l10n.dart';
import 'package:ente_auth/services/update_service.dart';
import 'package:ente_auth/theme/ente_theme.dart';
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:open_filex/open_filex.dart';
@ -22,6 +23,7 @@ class AppUpdateDialog extends StatefulWidget {
class _AppUpdateDialogState extends State<AppUpdateDialog> {
@override
Widget build(BuildContext context) {
final enteTextTheme = getEnteTextTheme(context);
final List<Widget> changelog = [];
for (final log in widget.latestVersionInfo!.changelog) {
changelog.add(
@ -43,18 +45,19 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
Text(
widget.latestVersionInfo!.name!,
style: const TextStyle(
fontSize: 20,
fontSize: 14,
fontWeight: FontWeight.bold,
),
),
const Padding(padding: EdgeInsets.all(8)),
const Text(
"Changelog",
style: TextStyle(
fontSize: 18,
if (changelog.isNotEmpty)
const Text(
"Changelog",
style: TextStyle(
fontSize: 18,
),
),
),
const Padding(padding: EdgeInsets.all(4)),
if (changelog.isNotEmpty) const Padding(padding: EdgeInsets.all(4)),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: changelog,
@ -71,36 +74,13 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
},
),
),
onPressed: () async {
Navigator.pop(context);
showDialog(
context: context,
builder: (BuildContext context) {
return ApkDownloaderDialog(widget.latestVersionInfo);
},
barrierDismissible: false,
);
},
child: const Text(
"Update",
),
),
),
const Padding(padding: EdgeInsets.all(8)),
Center(
child: InkWell(
child: Text(
context.l10n.installManually,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(decoration: TextDecoration.underline),
),
onTap: () => launchUrlString(
onPressed: () => launchUrlString(
widget.latestVersionInfo!.url!,
mode: LaunchMode.externalApplication,
),
child: Text(
context.l10n.downloadUpdate,
),
),
),
],
@ -110,8 +90,24 @@ class _AppUpdateDialogState extends State<AppUpdateDialog> {
return WillPopScope(
onWillPop: () async => !shouldForceUpdate,
child: AlertDialog(
title: Text(
shouldForceUpdate ? "Critical update available" : "Update available",
title: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
Icons.auto_awesome_outlined,
size: 24,
color: getEnteColorScheme(context).strokeMuted,
),
const SizedBox(
height: 16,
),
Text(
shouldForceUpdate
? context.l10n.criticalUpdateAvailable
: context.l10n.updateAvailable,
style: enteTextTheme.h3Bold,
),
],
),
content: content,
),
@ -166,15 +162,17 @@ class _ApkDownloaderDialogState extends State<ApkDownloaderDialog> {
Future<void> _downloadApk() async {
try {
await Network.instance.getDio().download(
widget.versionInfo!.url!,
_saveUrl,
onReceiveProgress: (count, _) {
setState(() {
_downloadProgress = count / widget.versionInfo!.size!;
});
},
);
if (!File(_saveUrl!).existsSync()) {
await Network.instance.getDio().download(
widget.versionInfo!.url!,
_saveUrl,
onReceiveProgress: (count, _) {
setState(() {
_downloadProgress = count / widget.versionInfo!.size!;
});
},
);
}
Navigator.of(context, rootNavigator: true).pop('dialog');
OpenFilex.open(_saveUrl);
} catch (e) {