diff options
Diffstat (limited to 'app/src/fil/libre/repwifiapp/activities/MainActivity.java')
-rw-r--r-- | app/src/fil/libre/repwifiapp/activities/MainActivity.java | 67 |
1 files changed, 42 insertions, 25 deletions
diff --git a/app/src/fil/libre/repwifiapp/activities/MainActivity.java b/app/src/fil/libre/repwifiapp/activities/MainActivity.java index 6e667bf..7a22416 100644 --- a/app/src/fil/libre/repwifiapp/activities/MainActivity.java +++ b/app/src/fil/libre/repwifiapp/activities/MainActivity.java @@ -20,7 +20,6 @@ package fil.libre.repwifiapp.activities; -import java.io.IOException; import java.net.SocketException; import fil.libre.repwifiapp.ActivityLauncher; import fil.libre.repwifiapp.Commons; @@ -29,8 +28,10 @@ import fil.libre.repwifiapp.ActivityLauncher.RequestCode; import fil.libre.repwifiapp.helpers.AccessPointInfo; import fil.libre.repwifiapp.helpers.ConnectionStatus; import fil.libre.repwifiapp.helpers.NetworkManager; +import fil.libre.repwifiapp.helpers.OpenVpnManager; import fil.libre.repwifiapp.helpers.RootCommand; import fil.libre.repwifiapp.helpers.Utils; +import fil.libre.repwifiapp.helpers.WpaSupplicant; import android.os.Bundle; import android.content.BroadcastReceiver; import android.content.Context; @@ -59,8 +60,16 @@ public class MainActivity extends MenuEnabledActivity { return; } + if (! Commons.storage.updateStorageVersion()){ + Utils.logError("Failed to convert storage file to new version!"); + } + setImage(); setUsbDeviceMonitor(); + setVersionOnTitle(); + + OpenVpnManager.initialize(this); + } @Override @@ -149,11 +158,6 @@ public class MainActivity extends MenuEnabledActivity { handleFinishedConnecting(conres, i); break; - case RequestCode.STATUS_GET: - ConnectionStatus status = (ConnectionStatus) intent.getExtras().getSerializable( - ActivityLauncher.EXTRA_CONSTATUS); - handleResultGetStatus(status); - break; case RequestCode.NETWORKS_GET: AccessPointInfo[] nets = (AccessPointInfo[]) intent.getExtras().getSerializable( @@ -182,6 +186,7 @@ public class MainActivity extends MenuEnabledActivity { } break; + default: break; @@ -190,6 +195,23 @@ public class MainActivity extends MenuEnabledActivity { } + private void setVersionOnTitle() { + + try { + + String vers = getPackageManager().getPackageInfo(getPackageName(), 0).versionName; + if (vers == null) { + return; + } + + setTitle(getTitle() + " - v." + vers); + + } catch (Exception e) { + Utils.logError("Error while setting version on MainActivity's title.", e); + } + + } + private void setImage() { ImageView img = (ImageView) findViewById(R.id.img_logo); @@ -197,7 +219,7 @@ public class MainActivity extends MenuEnabledActivity { try { Drawable d = Drawable.createFromStream(getAssets().open("repwifi-logo-0.png"), null); img.setImageDrawable(d); - } catch (IOException e) { + } catch (Exception e) { Utils.logError("Error while loading logo image", e); } @@ -224,6 +246,7 @@ public class MainActivity extends MenuEnabledActivity { } private boolean checkConditions() { + return (checkRootEnabled() && checkInterface(true)); } @@ -233,7 +256,7 @@ public class MainActivity extends MenuEnabledActivity { String msg = ""; try { - res = Commons.connectionEngine.isInterfaceAvailable(Commons.INTERFACE_NAME); + res = Commons.connectionEngine.isInterfaceAvailable(WpaSupplicant.INTERFACE_NAME); } catch (SocketException e) { Utils.logError("SocketException during isInterfaceAvailable()", e); msg = "Error while retrieving interface list!"; @@ -258,7 +281,7 @@ public class MainActivity extends MenuEnabledActivity { int excode = -1; try { - excode = su.execute(); + excode = su.testRootAccess(); } catch (Exception e) { Utils.logError("Error while trying to get first Super User access.", e); excode = -1; @@ -304,7 +327,7 @@ public class MainActivity extends MenuEnabledActivity { if (i.needsPassword()) { - // try to fetch network's password from storage + // try to fetch network's configuration from storage AccessPointInfo fromStorage = Commons.storage.getSavedNetwork(i); if (fromStorage == null) { @@ -327,12 +350,6 @@ public class MainActivity extends MenuEnabledActivity { launcher.launchLongTaskActivityConnect(i); } - private void handleResultGetStatus(ConnectionStatus status) { - if (status != null && status.isConnected()) { - launcher.launchStatusActivity(status); - } - } - private void handleFinishedConnecting(boolean connectionResult, AccessPointInfo info) { if (connectionResult && info.needsPassword()) { @@ -345,13 +362,13 @@ public class MainActivity extends MenuEnabledActivity { // Save network if (Commons.storage.save(info)) { - Toast toast2 = Toast.makeText(getApplicationContext(), "Network Saved!", - Toast.LENGTH_LONG); + Toast toast2 = Toast.makeText(getApplicationContext(), + getString(R.string.msg_network_saved), Toast.LENGTH_LONG); toast2.show(); } else { - Toast toast2 = Toast.makeText(getApplicationContext(), "FAILED to save network!", - Toast.LENGTH_LONG); + Toast toast2 = Toast.makeText(getApplicationContext(), + getString(R.string.msg_network_save_fail), Toast.LENGTH_LONG); toast2.show(); } @@ -360,8 +377,8 @@ public class MainActivity extends MenuEnabledActivity { } else { // alert that connection failed - Toast toast = Toast.makeText(getApplicationContext(), "FAILED to connect!", - Toast.LENGTH_LONG); + Toast toast = Toast.makeText(getApplicationContext(), + getString(R.string.msg_connect_fail), Toast.LENGTH_LONG); toast.show(); } } @@ -371,9 +388,9 @@ public class MainActivity extends MenuEnabledActivity { NetworkManager manager = new NetworkManager(Commons.getNetworkStorageFile()); String msg = ""; if (manager.remove(info)) { - msg = "Network info deleted!"; + msg = getString(R.string.msg_netinfo_deleted); } else { - msg = "FAILED to delete network info!"; + msg = getString(R.string.msg_netinfo_delete_fail); } Toast toast = Toast.makeText(this, msg, Toast.LENGTH_LONG); @@ -437,7 +454,7 @@ public class MainActivity extends MenuEnabledActivity { } catch (Exception e) { Utils.logError("Error while autoconnecting", e); - Commons.showMessage("An error occured while trying to auto-connect", this); + Commons.showMessage(getString(R.string.msg_autoconnect_error), this); } } |