Skip to content
Snippets Groups Projects
Commit 6342afa3 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

Add UWP path get/set

- adds UWP app path get and set to manager class

Change-Id: I50b825f11a0581f0f2659389a08a85d0b8e778b8
parent 702ee1f4
Branches
No related tags found
No related merge requests found
...@@ -1970,7 +1970,13 @@ std::string ...@@ -1970,7 +1970,13 @@ std::string
Manager::retrieveConfigPath() const Manager::retrieveConfigPath() const
{ {
static const char * const PROGNAME = "dring"; static const char * const PROGNAME = "dring";
#ifdef WIN32_NATIVE
return UWPAppPath_ +
DIR_SEPARATOR_STR + std::string(".config") +
DIR_SEPARATOR_STR + PROGNAME + ".yml";
#else
return fileutils::get_config_dir() + DIR_SEPARATOR_STR + PROGNAME + ".yml"; return fileutils::get_config_dir() + DIR_SEPARATOR_STR + PROGNAME + ".yml";
#endif
} }
/** /**
...@@ -2568,6 +2574,18 @@ Manager::loadAccountOrder() const ...@@ -2568,6 +2574,18 @@ Manager::loadAccountOrder() const
return split_string(preferences.getAccountOrder(), '/'); return split_string(preferences.getAccountOrder(), '/');
} }
void
Manager::setUWPAppPath(const char* app_path)
{
UWPAppPath_ = std::string(app_path);
}
std::string
Manager::getUWPAppPath() const
{
return UWPAppPath_;
}
void void
Manager::loadAccount(const YAML::Node &node, int &errorCount, Manager::loadAccount(const YAML::Node &node, int &errorCount,
const std::string &accountOrder) const std::string &accountOrder)
......
...@@ -769,6 +769,16 @@ class Manager { ...@@ -769,6 +769,16 @@ class Manager {
*/ */
std::vector<std::string> loadAccountOrder() const; std::vector<std::string> loadAccountOrder() const;
/**
* @param app_path The Universal Windows Application path
*/
void setUWPAppPath(const char* app_path);
/**
* @return std::string The Universal Windows Application path
*/
std::string getUWPAppPath() const;
private: private:
std::atomic_bool autoAnswer_ {false}; std::atomic_bool autoAnswer_ {false};
...@@ -865,6 +875,11 @@ class Manager { ...@@ -865,6 +875,11 @@ class Manager {
*/ */
std::string path_; std::string path_;
/**
* Universal Windows Platform Application path
*/
std::string UWPAppPath_;
/** /**
* Load the account map from configuration * Load the account map from configuration
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment