Merge branch 'trunk' into sendinvites

.drone.yml

@@ -163,19 +163,20 @@ trigger:
 
 ---
 kind: pipeline
-type: exec
+type: docker
 name: windows
 
 platform:
   os: windows
-  arch: amd64
-  #version: 1809
+  #arch: amd64
+  version: 1809
 
 clone:
   disable: true
 
 steps:
   - name: clone
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.2rc
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -193,14 +194,17 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.2rc
     commands:
       - git describe --tags > VERSION
       - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE
       - .\fetch-libcwtch-go.ps1
+      -
   - name: build-windows
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.2rc
     commands:
-      - C:\src\flutter\bin\flutter pub get
-      - C:\src\flutter\bin\flutter build windows
+      - flutter pub get
+      - flutter build windows
         # flwtch-`cat VERSION`-`cat BUILDDATE`
       - $Env:builddir = 'deploy\flwtch-win-'
       - $Env:builddir += type .\VERSION
@@ -217,19 +221,19 @@ steps:
       - dir
       - dir deploy
   - name: deploy-windows
+    image: openpriv/flutter-desktop:windows-sdk30-fdev2.2rc
     when:
         event: push
         status: [ success ]
     environment:
       BUILDFILES_KEY:
-        from_secret: buildfiles_key_txt
+        from_secret: buildfiles_key
     commands:
-      - echo "hello"
-      - dir
-      - echo $Env:BUILDFILES_KEY > id_rsa
-      - dir
-      # TODO: make pscp load a profile with the server key accepted
-      - C:\\bin\\pscp -P 22 -r -batch -i id_rsa deploy\\* buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
+      #- echo $Env:BUILDFILES_KEY > id_rsa
+      - echo $Env:BUILDFILES_KEY > id_rsab64
+      - certutil -decode id_rsab64 id_rsa
+      - #C:\\bin\\pscp -P 22 -r -batch -i id_rsa deploy\\* buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
+      - scp -r -o StrictHostKeyChecking=no -i id_rsa deploy\\* buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
 
 trigger:
   repo: flutter/flutter_app

android/app/src/main/AndroidManifest.xml

@@ -35,6 +35,11 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+
     </application>
 
+    <!--Needed to access Tor socket-->
+    <uses-permission android:name="android.permission.INTERNET" />
+
 </manifest>

lib/views/profilemgrview.dart

@@ -31,31 +31,36 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Provider.of<Settings>(context).theme.backgroundMainColor(),
-      appBar: AppBar(
-        title: Text(AppLocalizations.of(context).titleManageProfiles),
-        actions: [
-          IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
-          IconButton(icon: Icon(Icons.bug_report_outlined), onPressed: _setLoggingLevelDebug),
-          IconButton(
-            icon: Icon(Icons.lock_open),
-            tooltip: AppLocalizations.of(context).tooltipUnlockProfiles,
-            onPressed: _modalUnlockProfiles,
+    // Prevents Android back button from closing the app on the profile manager screen
+    // (which would shutdown connections and all kinds of other expensive to generate things)
+    // TODO pop up a dialogue regarding closing the app?
+    return new WillPopScope(
+        onWillPop: () async => false,
+        child: Scaffold(
+          backgroundColor: Provider.of<Settings>(context).theme.backgroundMainColor(),
+          appBar: AppBar(
+            title: Text(AppLocalizations.of(context).titleManageProfiles),
+            actions: [
+              IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
+              IconButton(icon: Icon(Icons.bug_report_outlined), onPressed: _setLoggingLevelDebug),
+              IconButton(
+                icon: Icon(Icons.lock_open),
+                tooltip: AppLocalizations.of(context).tooltipUnlockProfiles,
+                onPressed: _modalUnlockProfiles,
+              ),
+              IconButton(icon: Icon(Icons.settings), tooltip: AppLocalizations.of(context).tooltipOpenSettings, onPressed: _pushGlobalSettings),
+            ],
           ),
-          IconButton(icon: Icon(Icons.settings), tooltip: AppLocalizations.of(context).tooltipOpenSettings, onPressed: _pushGlobalSettings),
-        ],
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _pushAddEditProfile,
-        tooltip: AppLocalizations.of(context).addNewProfileBtn,
-        child: Icon(
-          Icons.add,
-          semanticLabel: AppLocalizations.of(context).addNewProfileBtn,
-        ),
-      ),
-      body: _buildProfileManager(), //_buildSuggestions(),
-    );
+          floatingActionButton: FloatingActionButton(
+            onPressed: _pushAddEditProfile,
+            tooltip: AppLocalizations.of(context).addNewProfileBtn,
+            child: Icon(
+              Icons.add,
+              semanticLabel: AppLocalizations.of(context).addNewProfileBtn,
+            ),
+          ),
+          body: _buildProfileManager(), //_buildSuggestions(),
+        ));
   }
 
   void _setLoggingLevelDebug() {