mirror of
https://github.com/wownero/wownerujo.git
synced 2026-11-22 00:03:58 +01:00
Random fixes (#228)
* adapt for android studio 3.1 and remove witness * set networktype from node * add monero logging for DEBUG builds * do not reset timestamps in apk * no witness * new version & apk naming
This commit is contained in:
@@ -743,7 +743,9 @@ public class LoginActivity extends SecureActivity
|
||||
}
|
||||
|
||||
void startLoginFragment() {
|
||||
// we set these here because we cannot be ceratin we have permissions for storage before
|
||||
Helper.setMoneroHome(this);
|
||||
Helper.initLogger(this);
|
||||
Fragment fragment = new LoginFragment();
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.add(R.id.fragment_container, fragment).commit();
|
||||
|
||||
@@ -86,6 +86,10 @@ public class WalletNode {
|
||||
return name;
|
||||
}
|
||||
|
||||
public NetworkType getNetworkType() {
|
||||
return networkType;
|
||||
}
|
||||
|
||||
public String getAddress() {
|
||||
return host + ":" + port;
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ public class WalletManager {
|
||||
if (WalletManager.Instance == null) {
|
||||
WalletManager.Instance = new WalletManager();
|
||||
}
|
||||
|
||||
return WalletManager.Instance;
|
||||
}
|
||||
|
||||
@@ -215,7 +216,7 @@ public class WalletManager {
|
||||
//public void setDaemon(String address, NetworkType networkType, String username, String password) {
|
||||
public void setDaemon(WalletNode walletNode) {
|
||||
this.daemonAddress = walletNode.getAddress();
|
||||
this.networkType = networkType;
|
||||
this.networkType = walletNode.getNetworkType();
|
||||
this.daemonUsername = walletNode.getUsername();
|
||||
this.daemonPassword = walletNode.getPassword();
|
||||
setDaemonAddressJ(daemonAddress);
|
||||
@@ -269,5 +270,17 @@ public class WalletManager {
|
||||
|
||||
//TODO static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, const std::string &subdir);
|
||||
|
||||
|
||||
static public native void initLogger(String argv0, String defaultLogBaseName);
|
||||
//TODO: maybe put these in an enum like in monero core - but why?
|
||||
static public int LOGLEVEL_SILENT = -1;
|
||||
static public int LOGLEVEL_WARN = 0;
|
||||
static public int LOGLEVEL_INFO = 1;
|
||||
static public int LOGLEVEL_DEBUG = 2;
|
||||
static public int LOGLEVEL_TRACE = 3;
|
||||
static public int LOGLEVEL_MAX = 4;
|
||||
static public native void setLogLevel(int level);
|
||||
static public native void logDebug(String category, String message);
|
||||
static public native void logInfo(String category, String message);
|
||||
static public native void logWarning(String category, String message);
|
||||
static public native void logError(String category, String message);
|
||||
}
|
||||
@@ -38,6 +38,7 @@ import android.view.animation.Animation;
|
||||
import android.view.animation.AnimationUtils;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
|
||||
import com.m2049r.xmrwallet.BuildConfig;
|
||||
import com.m2049r.xmrwallet.R;
|
||||
import com.m2049r.xmrwallet.model.NetworkType;
|
||||
import com.m2049r.xmrwallet.model.Wallet;
|
||||
@@ -287,4 +288,19 @@ public class Helper {
|
||||
throw new IllegalStateException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
static public void initLogger(Context context) {
|
||||
if (BuildConfig.DEBUG) {
|
||||
initLogger(context, WalletManager.LOGLEVEL_DEBUG);
|
||||
}
|
||||
// no logger if not debug
|
||||
}
|
||||
|
||||
// TODO make the log levels refer to the WalletManagerFactory::LogLevel enum ?
|
||||
static public void initLogger(Context context, int level) {
|
||||
String home = getStorage(context, HOME_DIR).getAbsolutePath();
|
||||
WalletManager.initLogger(home + "/monerujo", "monerujo.log");
|
||||
if (level >= WalletManager.LOGLEVEL_SILENT)
|
||||
WalletManager.setLogLevel(level);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user