diff --git a/.gitignore b/.gitignore index 64d3c976..c6cd180d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,11 @@ -# Built application files -*.apk -*.ap_ - -# Files for the Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild +/app/build diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..30aa626c --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..7ac24c77 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..37a75096 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 3b951549..e45eb6b2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,30 @@ -Sphincter Remote +Sphincter-Remote ================ -a simple android app to unlock doors :) +Sphincter-Remote is an Android app to unlock doors via simple HTTPS calls. +A server side program that works with this app is [Sphincter](https://github.com/openlab-aux/). ![image](screenshots.png) + +## Download + +## Build from Sources + +On Linux based systems: + +``` +./gradlew assembleRelease +``` + +## API + +Sphincter-Remote allows you to set an URL (e.g. `https://example.com/door/`) and a token (e.g. `secret123`) that will be used for a HTTP request: + +``` +https://example.com/door/?action=open&token=secret123 +``` + +Sphincter uses `open`, `close` or `state` as an action. +As a reponse, `LOCKED` or `UNLOCKED` may be returned. + +An option allows to ignore certificate errors. But beware, that's dangerous! diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..cb0eff75 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + defaultConfig { + applicationId 'com.example.sphincter' + minSdkVersion 25 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + buildToolsVersion '28.0.3' + productFlavors { + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } +} + +dependencies { + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:25.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/src/androidTest/java/com/michiwend/sphincterremote/ApplicationTest.java b/app/src/androidTest/java/com/michiwend/sphincterremote/ApplicationTest.java deleted file mode 100644 index 49171a6b..00000000 --- a/app/src/androidTest/java/com/michiwend/sphincterremote/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.michiwend.sphincterremote; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7eb081b7..a694da1a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,19 +1,18 @@ + package="com.example.sphincter" > - @@ -23,7 +22,7 @@ diff --git a/app/src/main/java/com/example/sphincter/sphincter/HttpsTrustManager.java b/app/src/main/java/com/example/sphincter/sphincter/HttpsTrustManager.java new file mode 100644 index 00000000..ff240d4b --- /dev/null +++ b/app/src/main/java/com/example/sphincter/sphincter/HttpsTrustManager.java @@ -0,0 +1,67 @@ +package com.example.sphincter; + +import java.security.cert.X509Certificate; + +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLContext; +import java.security.SecureRandom; +import java.security.NoSuchAlgorithmException; +import java.security.KeyManagementException; + + +public class HttpsTrustManager implements X509TrustManager { + private static TrustManager[] trustManagers; + private static final X509Certificate[] _AcceptedIssuers = new X509Certificate[]{}; + + @Override + public void checkClientTrusted( + X509Certificate[] x509Certificates, String s) + throws java.security.cert.CertificateException { + } + + @Override + public void checkServerTrusted( + X509Certificate[] x509Certificates, String s) + throws java.security.cert.CertificateException { + } + + public boolean isClientTrusted(X509Certificate[] chain) { + return true; + } + + public boolean isServerTrusted(X509Certificate[] chain) { + return true; + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return _AcceptedIssuers; + } + + public static void allowAllSSL() { + HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { + @Override + public boolean verify(String arg0, SSLSession arg1) { + return true; + } + }); + + SSLContext context = null; + if (trustManagers == null) { + trustManagers = new TrustManager[]{new HttpsTrustManager()}; + } + + try { + context = SSLContext.getInstance("TLS"); + context.init(null, trustManagers, new SecureRandom()); + } catch (NoSuchAlgorithmException | KeyManagementException e) { + e.printStackTrace(); + } + + HttpsURLConnection.setDefaultSSLSocketFactory(context != null ? context.getSocketFactory() : null); + } +} diff --git a/app/src/main/java/com/michiwend/sphincterremote/MainActivity.java b/app/src/main/java/com/example/sphincter/sphincter/MainActivity.java similarity index 77% rename from app/src/main/java/com/michiwend/sphincterremote/MainActivity.java rename to app/src/main/java/com/example/sphincter/sphincter/MainActivity.java index 27e54801..445400a5 100644 --- a/app/src/main/java/com/michiwend/sphincterremote/MainActivity.java +++ b/app/src/main/java/com/example/sphincter/sphincter/MainActivity.java @@ -1,4 +1,4 @@ -package com.michiwend.sphincterremote; +package com.example.sphincter; import android.app.Activity; import android.content.BroadcastReceiver; @@ -20,7 +20,6 @@ import android.widget.Button; import android.widget.ImageView; - enum UIState { OPEN, CLOSED, @@ -28,13 +27,12 @@ enum UIState { DISABLED, } - public class MainActivity extends Activity implements OnTaskCompleted { private OnTaskCompleted listener; private SharedPreferences prefs; private ImageView stateIcon; - private boolean enabelRefreshButton; + private boolean enableRefreshButton; @Override protected void onCreate(Bundle savedInstanceState) { @@ -42,15 +40,12 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - - if( intent.getAction().equals("android.net.conn.CONNECTIVITY_CHANGE") && isWifiConnected(context) ) { + if (intent.getAction().equals("android.net.conn.CONNECTIVITY_CHANGE") && isWifiConnected(context)) { new SphincterRequestHandler(listener, prefs).execute(Action.update_state); - } - else { + } else { changeUI(UIState.DISABLED); } } @@ -60,15 +55,26 @@ public void onReceive(Context context, Intent intent) { intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); registerReceiver(broadcastReceiver, intentFilter); - - +/* + CheckBox checkBoxLab = (CheckBox) findViewById(R.id.checkbox_ignore); + checkBoxLab.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + System.out.println(String.format("checkbox changed %b", isChecked)); + if (isChecked) { + HttpsTrustManager.allowAllSSL(); + } else { + // TODO: disable + } + } + }); +*/ stateIcon = (ImageView) findViewById(R.id.stateIcon); listener = this; prefs = PreferenceManager.getDefaultSharedPreferences(this); Button button_open = (Button) findViewById(R.id.button_open); - button_open.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -77,7 +83,6 @@ public void onClick(View view) { }); Button button_close = (Button) findViewById(R.id.button_close); - button_close.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -94,10 +99,9 @@ private boolean isWifiConnected(Context context) { Log.i("[WIFI-STATE]", wifiNetInfo.getDetailedState().toString()); - if(wifiNetInfo.isConnected()) { + if (wifiNetInfo.isConnected()) { return true; - } - else { + } else { return false; } } @@ -107,40 +111,40 @@ private void changeUI(UIState state) { Button bc = (Button) findViewById(R.id.button_close); Button bo = (Button) findViewById(R.id.button_open); - switch(state) { case OPEN: - stateIcon.setImageResource(R.drawable.labstate_open); + stateIcon.setImageResource(R.drawable.state_open); bc.setEnabled(true); bo.setEnabled(true); break; case CLOSED: - stateIcon.setImageResource(R.drawable.labstate_closed); + stateIcon.setImageResource(R.drawable.state_closed); bc.setEnabled(true); bo.setEnabled(true); break; case DISABLED: - stateIcon.setImageResource(R.drawable.labstate_wifi); + stateIcon.setImageResource(R.drawable.state_wifi); bc.setEnabled(false); bo.setEnabled(false); - enabelRefreshButton = false; + enableRefreshButton = false; break; case UNKNOWN: - stateIcon.setImageResource(R.drawable.labstate_unknown); - bc.setEnabled(false); - bo.setEnabled(false); + stateIcon.setImageResource(R.drawable.state_unknown); + // Enable, in case the API does not support state queries + bc.setEnabled(true); + bo.setEnabled(true); break; } if(state != UIState.DISABLED) { - enabelRefreshButton = true; + enableRefreshButton = true; } + // update action bar menu invalidateOptionsMenu(); - } @Override @@ -148,25 +152,22 @@ public void onTaskCompleted(String result) { Log.i("[GET RESULT]", result); - if( result.equals("UNLOCKED") ) { + if (result.equals("UNLOCKED")) { // Door unlocked changeUI(UIState.OPEN); - } - else if ( result.equals("LOCKED") ) { + } else if (result.equals("LOCKED")) { // Door locked changeUI(UIState.CLOSED); - } - else { + } else { changeUI(UIState.UNKNOWN); } } - @Override protected void onStart() { super.onStart(); - if(isWifiConnected(this.getApplicationContext())) { + if (isWifiConnected(this.getApplicationContext())) { new SphincterRequestHandler(listener, prefs).execute(Action.update_state); } } @@ -177,14 +178,14 @@ public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.main, menu); MenuItem refreshMenuItem = menu.findItem(R.id.action_reload); - if(!enabelRefreshButton) { + if (!enableRefreshButton) { refreshMenuItem.setEnabled(false); refreshMenuItem.getIcon().setAlpha(130); - } - else { + } else { refreshMenuItem.setEnabled(true); refreshMenuItem.getIcon().setAlpha(255); } + return true; } @@ -200,11 +201,11 @@ public boolean onOptionsItemSelected(MenuItem item) { startActivity(i); return true; } - if(id == R.id.action_reload) { + + if (id == R.id.action_reload) { new SphincterRequestHandler(listener, prefs).execute(Action.update_state); } return super.onOptionsItemSelected(item); } - } diff --git a/app/src/main/java/com/michiwend/sphincterremote/OnTaskCompleted.java b/app/src/main/java/com/example/sphincter/sphincter/OnTaskCompleted.java similarity index 67% rename from app/src/main/java/com/michiwend/sphincterremote/OnTaskCompleted.java rename to app/src/main/java/com/example/sphincter/sphincter/OnTaskCompleted.java index 73dab119..0a2c2ebd 100644 --- a/app/src/main/java/com/michiwend/sphincterremote/OnTaskCompleted.java +++ b/app/src/main/java/com/example/sphincter/sphincter/OnTaskCompleted.java @@ -1,4 +1,4 @@ -package com.michiwend.sphincterremote; +package com.example.sphincter; public interface OnTaskCompleted { diff --git a/app/src/main/java/com/michiwend/sphincterremote/SettingsActivity.java b/app/src/main/java/com/example/sphincter/sphincter/SettingsActivity.java similarity index 88% rename from app/src/main/java/com/michiwend/sphincterremote/SettingsActivity.java rename to app/src/main/java/com/example/sphincter/sphincter/SettingsActivity.java index d4840fde..d221624c 100644 --- a/app/src/main/java/com/michiwend/sphincterremote/SettingsActivity.java +++ b/app/src/main/java/com/example/sphincter/sphincter/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.michiwend.sphincterremote; +package com.example.sphincter; import android.os.Bundle; import android.preference.PreferenceActivity; @@ -10,6 +10,5 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.settings); - } } diff --git a/app/src/main/java/com/michiwend/sphincterremote/SphincterRequestHandler.java b/app/src/main/java/com/example/sphincter/sphincter/SphincterRequestHandler.java similarity index 56% rename from app/src/main/java/com/michiwend/sphincterremote/SphincterRequestHandler.java rename to app/src/main/java/com/example/sphincter/sphincter/SphincterRequestHandler.java index e9411079..d90475d4 100644 --- a/app/src/main/java/com/michiwend/sphincterremote/SphincterRequestHandler.java +++ b/app/src/main/java/com/example/sphincter/sphincter/SphincterRequestHandler.java @@ -1,16 +1,18 @@ -package com.michiwend.sphincterremote; +package com.example.sphincter; import android.content.SharedPreferences; import android.os.AsyncTask; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; +import java.net.URLConnection; import java.net.URL; +import javax.net.ssl.HttpsURLConnection; + enum Action { open_door, @@ -32,6 +34,10 @@ public SphincterRequestHandler(OnTaskCompleted l, SharedPreferences p){ protected String doInBackground(Action... params) { String url = sharedPreferences.getString("prefURL", ""); + if (url.isEmpty()) { + return ""; + } + switch (params[0]) { case open_door: url += "?action=open"; @@ -47,24 +53,60 @@ protected String doInBackground(Action... params) { return CallSphincterAPI(url); } +/* + public static void disableCertificateValidation() + { + // Create a trust manager that does not validate certificate chains + TrustManager[] trustAllCerts = new TrustManager[] { + new TrustAllManager() + }; + + // Ignore differences between given hostname and certificate hostname + HostnameVerifier hv = new TrustAllHostnameVerifier(); + + // Install the all-trusting trust manager + try + { + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, trustAllCerts, new SecureRandom()); + HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); + HttpsURLConnection.setDefaultHostnameVerifier(hv); + } catch (Exception e) {} + } +*/ final String CallSphincterAPI(String urlstr) { try { + // TODO: call on checkbox press + if (sharedPreferences.getBoolean("prefIgnore", false)) { + System.out.println("allow all ssl"); + HttpsTrustManager.allowAllSSL(); + } //else... + URL url = new URL(urlstr); + URLConnection connection = url.openConnection(); - HttpURLConnection con = (HttpURLConnection) url.openConnection(); - con.setConnectTimeout(2000); + //TODO: remove + if (connection instanceof HttpsURLConnection) { + System.out.println("is https connection"); + } - return readStream(con.getInputStream()); + if (connection instanceof HttpURLConnection) { + HttpURLConnection con = (HttpURLConnection) connection; + con.setConnectTimeout(2000); + return readStream(con.getInputStream()); + } } catch (Exception e) { e.printStackTrace(); } + return ""; } private String readStream(InputStream in) { BufferedReader reader = null; String result =""; + try { reader = new BufferedReader(new InputStreamReader(in)); String line = ""; @@ -83,6 +125,7 @@ private String readStream(InputStream in) { } } } + return result; } diff --git a/app/src/main/res/drawable-hdpi/labstate_closed.png b/app/src/main/res/drawable-hdpi/state_closed.png similarity index 100% rename from app/src/main/res/drawable-hdpi/labstate_closed.png rename to app/src/main/res/drawable-hdpi/state_closed.png diff --git a/app/src/main/res/drawable-hdpi/labstate_open.png b/app/src/main/res/drawable-hdpi/state_open.png similarity index 100% rename from app/src/main/res/drawable-hdpi/labstate_open.png rename to app/src/main/res/drawable-hdpi/state_open.png diff --git a/app/src/main/res/drawable-hdpi/labstate_unknown.png b/app/src/main/res/drawable-hdpi/state_unknown.png similarity index 100% rename from app/src/main/res/drawable-hdpi/labstate_unknown.png rename to app/src/main/res/drawable-hdpi/state_unknown.png diff --git a/app/src/main/res/drawable-hdpi/labstate_wifi.png b/app/src/main/res/drawable-hdpi/state_wifi.png similarity index 100% rename from app/src/main/res/drawable-hdpi/labstate_wifi.png rename to app/src/main/res/drawable-hdpi/state_wifi.png diff --git a/app/src/main/res/drawable-mdpi/labstate_closed.png b/app/src/main/res/drawable-mdpi/state_closed.png similarity index 100% rename from app/src/main/res/drawable-mdpi/labstate_closed.png rename to app/src/main/res/drawable-mdpi/state_closed.png diff --git a/app/src/main/res/drawable-mdpi/labstate_open.png b/app/src/main/res/drawable-mdpi/state_open.png similarity index 100% rename from app/src/main/res/drawable-mdpi/labstate_open.png rename to app/src/main/res/drawable-mdpi/state_open.png diff --git a/app/src/main/res/drawable-mdpi/labstate_unknown.png b/app/src/main/res/drawable-mdpi/state_unknown.png similarity index 100% rename from app/src/main/res/drawable-mdpi/labstate_unknown.png rename to app/src/main/res/drawable-mdpi/state_unknown.png diff --git a/app/src/main/res/drawable-mdpi/labstate_wifi.png b/app/src/main/res/drawable-mdpi/state_wifi.png similarity index 100% rename from app/src/main/res/drawable-mdpi/labstate_wifi.png rename to app/src/main/res/drawable-mdpi/state_wifi.png diff --git a/app/src/main/res/drawable-xhdpi/labstate_closed.png b/app/src/main/res/drawable-xhdpi/state_closed.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/labstate_closed.png rename to app/src/main/res/drawable-xhdpi/state_closed.png diff --git a/app/src/main/res/drawable-xhdpi/labstate_open.png b/app/src/main/res/drawable-xhdpi/state_open.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/labstate_open.png rename to app/src/main/res/drawable-xhdpi/state_open.png diff --git a/app/src/main/res/drawable-xhdpi/labstate_unknown.png b/app/src/main/res/drawable-xhdpi/state_unknown.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/labstate_unknown.png rename to app/src/main/res/drawable-xhdpi/state_unknown.png diff --git a/app/src/main/res/drawable-xhdpi/labstate_wifi.png b/app/src/main/res/drawable-xhdpi/state_wifi.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/labstate_wifi.png rename to app/src/main/res/drawable-xhdpi/state_wifi.png diff --git a/app/src/main/res/drawable-xxhdpi/labstate_closed.png b/app/src/main/res/drawable-xxhdpi/state_closed.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/labstate_closed.png rename to app/src/main/res/drawable-xxhdpi/state_closed.png diff --git a/app/src/main/res/drawable-xxhdpi/labstate_open.png b/app/src/main/res/drawable-xxhdpi/state_open.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/labstate_open.png rename to app/src/main/res/drawable-xxhdpi/state_open.png diff --git a/app/src/main/res/drawable-xxhdpi/labstate_unknown.png b/app/src/main/res/drawable-xxhdpi/state_unknown.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/labstate_unknown.png rename to app/src/main/res/drawable-xxhdpi/state_unknown.png diff --git a/app/src/main/res/drawable-xxhdpi/labstate_wifi.png b/app/src/main/res/drawable-xxhdpi/state_wifi.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/labstate_wifi.png rename to app/src/main/res/drawable-xxhdpi/state_wifi.png diff --git a/app/src/main/res/drawable-xxxhdpi/labstate_closed.png b/app/src/main/res/drawable-xxxhdpi/state_closed.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/labstate_closed.png rename to app/src/main/res/drawable-xxxhdpi/state_closed.png diff --git a/app/src/main/res/drawable-xxxhdpi/labstate_open.png b/app/src/main/res/drawable-xxxhdpi/state_open.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/labstate_open.png rename to app/src/main/res/drawable-xxxhdpi/state_open.png diff --git a/app/src/main/res/drawable-xxxhdpi/labstate_unknown.png b/app/src/main/res/drawable-xxxhdpi/state_unknown.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/labstate_unknown.png rename to app/src/main/res/drawable-xxxhdpi/state_unknown.png diff --git a/app/src/main/res/drawable-xxxhdpi/labstate_wifi.png b/app/src/main/res/drawable-xxxhdpi/state_wifi.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/labstate_wifi.png rename to app/src/main/res/drawable-xxxhdpi/state_wifi.png diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7f1892f8..3d66dcdd 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/stateIcon" - android:src="@drawable/labstate_open" + android:src="@drawable/state_open" android:layout_gravity="center" android:layout_weight="2" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e02ca0e7..e2d68bbf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ - Spincter Remote + Spincter Einstellungen Status aktualisieren @@ -13,4 +13,13 @@ Token Dein persönliches Zugangstoken + + Ignorieren + HTTPS Zertifikatfehler ignorieren + + Version + 1.1.0 + + Webseite + https://example.com \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7dfd0f69..6a92a550 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,6 @@ - - Sphincter Remote + Sphincter Settings Reload state @@ -9,8 +8,17 @@ Lock door URL - URL to sphincterd + URL of the door system Token Your personal access token + + Ignore + Ignore HTTPS certificate errors + + Version + 1.1.0 + + Website + https://example.com diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 024ace7e..7447c059 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -2,10 +2,11 @@ + @@ -15,4 +16,27 @@ android:key="prefToken" android:inputType="textVisiblePassword"/> - \ No newline at end of file + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..43c07085 --- /dev/null +++ b/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.3' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..743d692c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..7a3265ee Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..82fefcf8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 31 17:40:04 CET 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..e95643d6 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'