appdelegate refractored

GMERemittance.xcodeproj/project.pbxproj

@@ -361,6 +361,7 @@
 		D96848C9212D3AEB00EF12B1 /* ExtensionJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = D96848C8212D3AEB00EF12B1 /* ExtensionJSON.swift */; };
 		D96848CC212D3F2300EF12B1 /* ExchangeRateApiService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D96848CB212D3F2300EF12B1 /* ExchangeRateApiService.swift */; };
 		D96848CE212D419400EF12B1 /* ApiServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D96848CD212D419400EF12B1 /* ApiServiceType.swift */; };
+		D96A4FBC2146079600CFD507 /* AppConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D96A4FBB2146079600CFD507 /* AppConstants.swift */; };
 		D9768C88213BAE92009E01BC /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9768C87213BAE92009E01BC /* User.swift */; };
 		D99D72AA212D595B00601F48 /* CountryInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D99D72A9212D595B00601F48 /* CountryInfo.swift */; };
 		D9B7ADF02130048E009B0564 /* ExchangeRatesModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9B7ADDD2130048E009B0564 /* ExchangeRatesModuleInterface.swift */; };
@@ -786,6 +787,7 @@
 		D96848C8212D3AEB00EF12B1 /* ExtensionJSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionJSON.swift; sourceTree = "<group>"; };
 		D96848CB212D3F2300EF12B1 /* ExchangeRateApiService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExchangeRateApiService.swift; sourceTree = "<group>"; };
 		D96848CD212D419400EF12B1 /* ApiServiceType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiServiceType.swift; sourceTree = "<group>"; };
+		D96A4FBB2146079600CFD507 /* AppConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppConstants.swift; sourceTree = "<group>"; };
 		D9768C87213BAE92009E01BC /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		D99D72A9212D595B00601F48 /* CountryInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryInfo.swift; sourceTree = "<group>"; };
 		D9B7ADDD2130048E009B0564 /* ExchangeRatesModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExchangeRatesModuleInterface.swift; sourceTree = "<group>"; };
@@ -1206,6 +1208,7 @@
 		9FD260F61FD00458007A511D /* GMERemittance */ = {
 			isa = PBXGroup;
 			children = (
+				D96A4FBA2146075800CFD507 /* Utility */,
 				D9B7ADFB21300727009B0564 /* Base */,
 				D96848CA212D3F1200EF12B1 /* Api */,
 				D962231C212C123600B7A115 /* Model */,
@@ -2358,6 +2361,14 @@
 			path = Api;
 			sourceTree = "<group>";
 		};
+		D96A4FBA2146075800CFD507 /* Utility */ = {
+			isa = PBXGroup;
+			children = (
+				D96A4FBB2146079600CFD507 /* AppConstants.swift */,
+			);
+			path = Utility;
+			sourceTree = "<group>";
+		};
 		D9B7ADDB2130048E009B0564 /* ExchangeRates */ = {
 			isa = PBXGroup;
 			children = (
@@ -3172,6 +3183,7 @@
 				A252A4CC203ACFA0001EFF4C /* TransactionSuccessViewController.swift in Sources */,
 				045CB0C4202F27FA008DD982 /* SupportViewController.swift in Sources */,
 				D922D9202134DCF000D43053 /* EditReciepientInteractorIO.swift in Sources */,
+				D96A4FBC2146079600CFD507 /* AppConstants.swift in Sources */,
 				A2233B3420297CB60014AE4C /* AgentSearchTableViewCell.swift in Sources */,
 				D922D9632135145F00D43053 /* SendMoneyParentServiceType.swift in Sources */,
 				9F2ECFF72050F04C00AC880B /* MobileOperator.swift in Sources */,

GMERemittance/AppDelegate.swift

@@ -48,10 +48,39 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         IQKeyboardManager.shared.enable = true
         
         
+        registerForNotification(application: application)
+        FirebaseApp.configure()
+        Fabric.with([Crashlytics.self])
+        
+        if UserDefaults.standard.string(forKey: AppConstants.uuid) == nil {
+            let uuid = UUID().uuidString
+            UserDefaults.standard.set(uuid, forKey: AppConstants.uuid)
+        }
+        
+        setEntryPoint()
+        
+//        if (UserDefaults.standard.object(forKey: "com.gmeremit.loginStatus")) != nil{
+//             redirectToApp()
+//        }
+//
+        return true
+    }
+    
+    private func setEntryPoint() {
+        let _default = UserDefaults.standard
+        if let loginStatus = _default.string(forKey:  UserKeys.accessCode) {
+            // user is logged in
+            let mainWireFrame = MainWireframe.shared
+            self.window?.rootViewController = mainWireFrame?.getMainView()
+        }else {
+            // go to splashscreen
+        }
+    }
+    
+    private func registerForNotification(application: UIApplication) {
         if #available(iOS 10.0, *) {
             // For iOS 10 display notification (sent via APNS)
             UNUserNotificationCenter.current().delegate = self
-            
             let authOptions: UNAuthorizationOptions = [.alert, .badge, .sound]
             UNUserNotificationCenter.current().requestAuthorization(
                 options: authOptions,
@@ -63,25 +92,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
         
         application.registerForRemoteNotifications()
-        FirebaseApp.configure()
-        Fabric.with([Crashlytics.self])
-        if UserDefaults.standard.object(forKey: "com.gmeremit.uuid") != nil
-        {
-//            print("Old UUID: \(savedUUID)")
-            
-        } else {
-            
-            let uuid = UUID().uuidString
-            UserDefaults.standard.set(uuid, forKey: "com.gmeremit.uuid")
-            
-//            print("New UUID: \(uuid)")
-        }
-        
-        if (UserDefaults.standard.object(forKey: "com.gmeremit.loginStatus")) != nil{
-             redirectToApp()
-        }
-        
-        return true
     }
     
     func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) {

GMERemittance/RestApiManager.swift

@@ -34,12 +34,12 @@ class RestApiMananger {
 
     func getUUID() -> String {
         
-        let uuid = UserDefaults.standard.object(forKey: "com.gmeremit.uuid") as? String
+        let uuid = UserDefaults.standard.object(forKey: AppConstants.uuid) as? String
                 if uuid != nil {
                     return uuid!
                 } else {
                     let uuid = UUID().uuidString
-                    UserDefaults.standard.set(uuid, forKey: "com.gmeremit.uuid")
+                    UserDefaults.standard.set(uuid, forKey: AppConstants.uuid)
                     return uuid
                 }
     }

GMERemittance/Utility/AppConstants.swift

@@ -0,0 +1,14 @@
+//
+//  AppConstants.swift
+//  GMERemittance
+//
+//  Created by gme_2 on 10/09/2018.
+//  Copyright © 2018 Gobal Money Express Co. Ltd. All rights reserved.
+//
+
+import Foundation
+
+
+class AppConstants {
+    static let uuid = "uuid"
+}