dan
/
AndroidOD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaning up logging

This commit is contained in:
Dan Ballard 2017-09-23 09:16:37 -07:00
parent 9b1e768226
commit 45d56ae601
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/im/ricochet/androidod/ConnectActivity.java
View File

@ -39,9 +39,6 @@ public class ConnectActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
// Load identity and connect to addr. Enable appropriate buttons
// If no identity, generate.
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(im.ricochet.androidod.R.layout.activity_connect); setContentView(im.ricochet.androidod.R.layout.activity_connect);
@ -90,11 +87,11 @@ public class ConnectActivity extends AppCompatActivity {
String privateKey = prefs.getString(PRIVATE_KEY_KEY, ""); String privateKey = prefs.getString(PRIVATE_KEY_KEY, "");
Log.i(TAG, "Private key loaded:\n"+privateKey); Log.i(TAG, "Private key loaded:\n"+privateKey);
if (privateKey.equals("")) { if (privateKey.equals("")) {
Log.i(TAG, "regenerating pricate key"); Log.i(TAG, "Generating pricate key");
RegenIdentTask regenIdentTask = new RegenIdentTask(); RegenIdentTask regenIdentTask = new RegenIdentTask();
regenIdentTask.execute(); regenIdentTask.execute();
} else { } else {
Log.i(TAG, "setting identity, enabling regen"); Log.i(TAG, "Setting identity, Enabling regen");
setIdentity(privateKey); setIdentity(privateKey);
Button regenButton = (Button)findViewById(R.id.regenIdentButton); Button regenButton = (Button)findViewById(R.id.regenIdentButton);
regenButton.setEnabled(true); regenButton.setEnabled(true);
@ -149,7 +146,7 @@ public class ConnectActivity extends AppCompatActivity {
} }
private void setIdentity(String privateKey) { private void setIdentity(String privateKey) {
Log.i(TAG, "setIdentity(): " + privateKey); Log.i(TAG, "setIdentity()");
String addr = GoRicochetMobile.getOnionAddress(privateKey); String addr = GoRicochetMobile.getOnionAddress(privateKey);
Log.i(TAG, "setIdentity(): addr: '" + addr + "'"); Log.i(TAG, "setIdentity(): addr: '" + addr + "'");
idetityText.setText("ricochet:" + addr); idetityText.setText("ricochet:" + addr);