- Modularized global keys

vinicioslc · Dec 12, 2019 · f9a7ec1 · f9a7ec1
1 parent 4a7d530
commit f9a7ec1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/adb-actions/index.ts b/src/adb-actions/index.ts
@@ -1,6 +1,5 @@
 import { execSync } from 'child_process'
 import { NetHelpers } from '../ip-helpers'
-import { log } from 'util'
 
 export class ADBInterface {
   static ConnectToDevice(deviceIP: string): ADBResult {
@@ -75,7 +74,7 @@ export class ADBInterface {
     return result
   }
 
-  static disableFirebaseEventsDebug({ package_name }): string {
+  static disableFirebaseEventsDebug(): string {
     const result = execSync(
       `adb shell setprop debug.firebase.analytics.app .none.`
     ).toString()
@@ -116,8 +115,8 @@ export class ADBInterface {
       const output = result.toLocaleString()
       if (output.startsWith('List of devices attached')) {
         let ips = output.split(/[\r]|[\n]/gim)
-        ips = ips.filter((ip, index, array) => this.testIP(ip))
-        ips = ips.map((ipAddress, index, array) => {
+        ips = ips.filter(ip => this.testIP(ip))
+        ips = ips.map(ipAddress => {
           let nameOfDevice = this.getDeviceName(
             this.extractIPAddress(ipAddress)
           )

diff --git a/src/extension/global-state-keys.ts b/src/extension/global-state-keys.ts
@@ -0,0 +1,7 @@
+/**
+ * Store all keys for extension state management
+ */
+export default {
+  allPackages: 'last_app_package_name',
+  lastIPUsed: 'lastIPAddress'
+}
diff --git a/src/extension/index.ts b/src/extension/index.ts
@@ -1,6 +1,7 @@
 import { ADBResultState, ADBInterface } from '../adb-actions'
 import * as FirebaseExtension from '../firebase-actions'
 import * as vscode from 'vscode'
+import stateKeys from './global-state-keys'
 
 export async function ResetDevicesPort() {
   vscode.window.withProgress(
@@ -29,10 +30,8 @@ export async function ResetDevicesPort() {
   // Display a message box to the user
 }
 
-const LastIPAddressKey = 'lastIPAddress'
-
 export async function ConnectToDevice(context: vscode.ExtensionContext) {
-  let lastvalue = context.globalState.get(LastIPAddressKey, '')
+  let lastvalue = context.globalState.get(stateKeys.lastIPUsed, '')
   // The code you place here will be executed every time your command is executed
   vscode.window
     .showInputBox({
@@ -49,7 +48,7 @@ export async function ConnectToDevice(context: vscode.ExtensionContext) {
 }
 
 function connectToAdbDevice(context: vscode.ExtensionContext, value: string) {
-  context.globalState.update(LastIPAddressKey, value)
+  context.globalState.update(stateKeys.lastIPUsed, value)
   try {
     vscode.window.withProgress(
       {
@@ -132,12 +131,11 @@ export async function KillADBServer() {
   }
 }
 
-const allPackages = 'last_app_package_name'
 export async function EnableFirebaseDebugView(
   context: vscode.ExtensionContext
 ) {
   try {
-    let lastvalue = context.globalState.get(allPackages, [])
+    let lastvalue = context.globalState.get(stateKeys.allPackages, [])
 
     let packageName = await vscode.window.showInputBox({
       placeHolder: 'com.yourapp.domain',