From cb57557accfac388df9497dbbbf079e1b44d2eab Mon Sep 17 00:00:00 2001 From: Daniel Pollithy Date: Thu, 25 Jan 2018 02:07:12 +0100 Subject: [PATCH] fix seed problem start to refactor the service<->ui problem --- .../flashwifi/wifip2p/HotspotFragment.java | 19 ------------------- .../com/flashwifi/wifip2p/MainActivity.java | 2 +- .../com/flashwifi/wifip2p/SearchFragment.java | 1 - .../flashwifi/wifip2p/WelcomeActivity.java | 16 ++++++++++++---- .../broadcast/WiFiDirectBroadcastService.java | 17 +++++++++++++++++ app/src/main/res/layout/welcome_screen1.xml | 2 +- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java index 2fe6000..f8a0f13 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java +++ b/app/src/main/java/com/flashwifi/wifip2p/HotspotFragment.java @@ -79,26 +79,7 @@ public class HotspotFragment extends Fragment { //if (intent.hasExtra("what") && intent.getExtras().getString("what", "").equals("connectivity_changed")) { - NetworkInfo network_info = getmService().getNetwork_info(); - WifiP2pInfo p2p_info = getmService().getP2p_info(); - WifiP2pGroup wifiP2pGroup = getmService().getP2p_group(); - if (intent.hasExtra("currentDeviceConnected")) { - //String macAddress = intent.getExtras().getString("currentDeviceConnected"); - if (network_info.getState() == NetworkInfo.State.CONNECTED) { - // ToDo: look for the other device and make sure we are only two - - if (p2p_info.isGroupOwner) { - Snackbar.make(activity_view, "You are the group owner", Snackbar.LENGTH_LONG).setAction("Action", null).show(); - getmService().startNegotiationServer(false, null); - } else { - InetAddress groupOwnerAddress = p2p_info.groupOwnerAddress; - Snackbar.make(activity_view, "You are only a member of the group", Snackbar.LENGTH_LONG).setAction("Action", null).show(); - getmService().startNegotiationClient(groupOwnerAddress, false, null); - } - - } - } diff --git a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java index 83b1c05..02090f7 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java +++ b/app/src/main/java/com/flashwifi/wifip2p/MainActivity.java @@ -285,7 +285,7 @@ public class MainActivity extends AppCompatActivity } private void updateBalance() { - WalletBalanceChecker balanceChecker = new WalletBalanceChecker(this,this.getString(R.string.preference_file_key),seed, balanceHandler,PREF_UPDATE,true); + WalletBalanceChecker balanceChecker = new WalletBalanceChecker(this,this.getString(R.string.preference_file_key), seed, balanceHandler,PREF_UPDATE,true); balanceChecker.execute(); } diff --git a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java index 2a45300..056284e 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java +++ b/app/src/main/java/com/flashwifi/wifip2p/SearchFragment.java @@ -33,7 +33,6 @@ import java.net.InetAddress; import java.util.ArrayList; import com.flashwifi.wifip2p.broadcast.WiFiDirectBroadcastService; -import com.flashwifi.wifip2p.iotaFlashWrapper.Main; /** * Fragment that appears in the "content_frame", shows a planet diff --git a/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java b/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java index 4e64ccc..1248b2a 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java +++ b/app/src/main/java/com/flashwifi/wifip2p/WelcomeActivity.java @@ -127,7 +127,8 @@ public class WelcomeActivity extends AppCompatActivity { } else if(!firstTimeNoSeed) { launchHomeScreen(); } else { - startActivity(new Intent(WelcomeActivity.this, MainActivity.class)); + launchHomeScreenNormal(); + //startActivity(new Intent(WelcomeActivity.this, MainActivity.class)); } }); } @@ -165,6 +166,14 @@ public class WelcomeActivity extends AppCompatActivity { finish(); } + private void launchHomeScreenNormal() { + Intent intent = new Intent(this, MainActivity.class); + intent.putExtra("seed", seed); + intent.putExtra("password", password); + startActivity(intent); + finish(); + } + // viewpager change listener ViewPager.OnPageChangeListener viewPagerPageChangeListener = new ViewPager.OnPageChangeListener() { @@ -292,11 +301,10 @@ public class WelcomeActivity extends AppCompatActivity { private boolean decryptSeed(String password) { EncryptedPreferences encryptedPreferences = new EncryptedPreferences.Builder(this).withEncryptionPassword(password).build(); - String seed = encryptedPreferences.getString(getString(R.string.encrypted_seed), null); - View view = findViewById(R.id.home_view); + seed = encryptedPreferences.getString(getString(R.string.encrypted_seed), null); if (seed != null) { - //Snackbar.make(view, getString(R.string.seed_decrypted), Snackbar.LENGTH_LONG).setAction("Action", null).show(); + this.password = password; return true; } else { final EditText field = (EditText) findViewById(R.id.password); diff --git a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java index 85d697f..aafcd01 100644 --- a/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java +++ b/app/src/main/java/com/flashwifi/wifip2p/broadcast/WiFiDirectBroadcastService.java @@ -12,6 +12,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.DhcpInfo; import android.net.NetworkInfo; +import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pDevice; @@ -826,6 +827,22 @@ public class WiFiDirectBroadcastService extends Service { if (p2p_info.groupFormed) { currentDeviceConnected = p2p_info.groupOwnerAddress.getHostAddress(); sendUpdateUIBroadcastNewConnection(); + NetworkInfo network_info = getNetwork_info(); + WifiP2pInfo p2p_info = getP2p_info(); + WifiP2pGroup wifiP2pGroup = getP2p_group(); + + if (network_info.getState() == NetworkInfo.State.CONNECTED) { + // ToDo: look for the other device and make sure we are only two + if (p2p_info.isGroupOwner) { + //Snackbar.make(activity_view, "You are the group owner", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + startNegotiationServer(false, wifiP2pGroup.getOwner().deviceAddress); + } else { + InetAddress groupOwnerAddress = p2p_info.groupOwnerAddress; + //Snackbar.make(activity_view, "You are only a member of the group", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + startNegotiationClient(groupOwnerAddress, false, null); + } + + } } } diff --git a/app/src/main/res/layout/welcome_screen1.xml b/app/src/main/res/layout/welcome_screen1.xml index 29ffc67..0705d2d 100644 --- a/app/src/main/res/layout/welcome_screen1.xml +++ b/app/src/main/res/layout/welcome_screen1.xml @@ -28,7 +28,7 @@