Check for public key

desktop_client.py

@@ -1366,17 +1366,20 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
     desktopShown = False
     while (1):
         if not pgpKeyUpload:
-            sayStr = indent + 'Uploading PGP public key'
+            if not hasLocalPGPkey():
-            _sayCommand(sayStr, sayStr, screenreader,
+                print('No PGP public key was found')
-                        systemLanguage, espeak)
+            else:
-            pgpPublicKeyUpload(baseDir, session,
+                sayStr = indent + 'Uploading PGP public key'
-                               nickname, password,
+                _sayCommand(sayStr, sayStr, screenreader,
-                               domain, port, httpPrefix,
+                            systemLanguage, espeak)
-                               cachedWebfingers, personCache,
+                pgpPublicKeyUpload(baseDir, session,
-                               debug, False)
+                                   nickname, password,
-            sayStr = indent + 'PGP public key uploaded'
+                                   domain, port, httpPrefix,
-            _sayCommand(sayStr, sayStr, screenreader,
+                                   cachedWebfingers, personCache,
-                        systemLanguage, espeak)
+                                   debug, False)
+                sayStr = indent + 'PGP public key uploaded'
+                _sayCommand(sayStr, sayStr, screenreader,
+                            systemLanguage, espeak)
             pgpKeyUpload = True
 
         boxJson = c2sBoxJson(baseDir, session,