Refactor ApplicationContext

src/org/thoughtcrime/securesms/loki/activities/LandingActivity.kt

@@ -100,7 +100,7 @@ class LandingActivity : BaseActionBarActivity(), LinkDeviceSlaveModeDialogDelega
         }
         val application = ApplicationContext.getInstance(this)
         application.startPollingIfNeeded()
-        application.setUpP2PAPI()
+        application.setUpP2PAPIIfNeeded()
         application.setUpStorageAPIIfNeeded()
         val linkDeviceDialog = LinkDeviceSlaveModeDialog()
         linkDeviceDialog.delegate = this

src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt

@@ -91,7 +91,7 @@ class PNModeActivity : BaseActionBarActivity() {
         TextSecurePreferences.setHasSeenPNModeSheet(this, true) // Shouldn't be shown to users who've done the new onboarding
         val application = ApplicationContext.getInstance(this)
         application.setUpStorageAPIIfNeeded()
-        application.setUpP2PAPI()
+        application.setUpP2PAPIIfNeeded()
         val publicChatAPI = ApplicationContext.getInstance(this).lokiPublicChatAPI
         if (publicChatAPI != null) {
             // TODO: This won't be necessary anymore when we don't auto-join the Loki Public Chat anymore

src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt

@@ -183,7 +183,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                 AvatarHelper.setAvatar(this, Address.fromSerialized(TextSecurePreferences.getLocalNumber(this)), profilePicture)
                 TextSecurePreferences.setProfileAvatarId(this, SecureRandom().nextInt())
                 ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey)
-                ApplicationContext.getInstance(this).updatePublicChatProfilePictureIfNeeded()
+                ApplicationContext.getInstance(this).updateOpenGroupProfilePicturesIfNeeded()
                 profilePictureView.update()
             }
             profilePictureToBeUploaded = null