From d3c25b8be99caff9c95d60db5c31ab347e3ad413 Mon Sep 17 00:00:00 2001 From: Felix Prahl-Kamps Date: Sun, 10 Jun 2018 16:28:28 +0200 Subject: [PATCH] ported to IntelliJ Idea --- app/build.gradle | 5 +- .../ExampleInstrumentedTest.java | 6 +- app/src/main/AndroidManifest.xml | 51 +-- .../PreferenceManager.java | 54 ---- .../activity/SyncActivity.java | 48 --- .../adapter/ExtOrgAdapter.java | 48 --- .../activity/MainActivity.java | 85 +++-- .../activity/SettingsActivity.java | 138 ++++---- .../its/mispauth/activity/SyncActivity.java | 14 + .../its/mispauth/adapter/ExtOrgAdapter.java | 65 ++++ .../auxiliary/OrganisationDialog.java | 45 +++ .../mispauth/auxiliary/PreferenceManager.java | 95 ++++++ .../its/mispauth/auxiliary/ReadableError.java | 19 ++ .../wg/its/mispauth/model/Organisation.java | 186 +++++++++++ .../overview/wg/its/mispauth/model/User.java | 298 ++++++++++++++++++ .../network/MispRequest.java | 9 +- app/src/main/res/layout/activity_main.xml | 127 ++++---- app/src/main/res/layout/activity_settings.xml | 102 +----- .../main/res/layout/view_holder_ext_org.xml | 44 ++- .../res/layout/view_holder_organisation.xml | 84 +++++ app/src/main/res/values/strings.xml | 21 +- .../ExampleUnitTest.java | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 100 +++--- gradlew.bat | 14 +- 26 files changed, 1137 insertions(+), 527 deletions(-) rename app/src/androidTest/java/de/overview/wg/its/{misp_authentificator => mispauth}/ExampleInstrumentedTest.java (76%) delete mode 100644 app/src/main/java/de/overview/wg/its/misp_authentificator/PreferenceManager.java delete mode 100644 app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java delete mode 100644 app/src/main/java/de/overview/wg/its/misp_authentificator/adapter/ExtOrgAdapter.java rename app/src/main/java/de/overview/wg/its/{misp_authentificator => mispauth}/activity/MainActivity.java (51%) rename app/src/main/java/de/overview/wg/its/{misp_authentificator => mispauth}/activity/SettingsActivity.java (54%) create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/activity/SyncActivity.java create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/adapter/ExtOrgAdapter.java create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/auxiliary/OrganisationDialog.java create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/auxiliary/PreferenceManager.java create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/auxiliary/ReadableError.java create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/model/Organisation.java create mode 100644 app/src/main/java/de/overview/wg/its/mispauth/model/User.java rename app/src/main/java/de/overview/wg/its/{misp_authentificator => mispauth}/network/MispRequest.java (97%) create mode 100644 app/src/main/res/layout/view_holder_organisation.xml rename app/src/test/java/de/overview/wg/its/{misp_authentificator => mispauth}/ExampleUnitTest.java (76%) diff --git a/app/build.gradle b/app/build.gradle index c1ab0b5..5072aa0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,8 +2,9 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { - applicationId "de.overview.wg.its.misp_authentificator" + applicationId "de.overview.wg.its.mispauth" minSdkVersion 21 targetSdkVersion 27 versionCode 1 @@ -21,7 +22,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.1' 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/de/overview/wg/its/misp_authentificator/ExampleInstrumentedTest.java b/app/src/androidTest/java/de/overview/wg/its/mispauth/ExampleInstrumentedTest.java similarity index 76% rename from app/src/androidTest/java/de/overview/wg/its/misp_authentificator/ExampleInstrumentedTest.java rename to app/src/androidTest/java/de/overview/wg/its/mispauth/ExampleInstrumentedTest.java index b44b544..4435194 100644 --- a/app/src/androidTest/java/de/overview/wg/its/misp_authentificator/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/de/overview/wg/its/mispauth/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package de.overview.wg.its.misp_authentificator; +package de.overview.wg.its.mispauth; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -17,10 +17,10 @@ import static org.junit.Assert.*; @RunWith(AndroidJUnit4.class) public class ExampleInstrumentedTest { @Test - public void useAppContext() { + public void useAppContext() throws Exception { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("de.overview.wg.its.misp_authentificator", appContext.getPackageName()); + assertEquals("de.overview.wg.its.mispauth", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b226a9c..b80b394 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,33 +1,34 @@ + package="de.overview.wg.its.mispauth"> - + - - - - + - - - + + + - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/PreferenceManager.java b/app/src/main/java/de/overview/wg/its/misp_authentificator/PreferenceManager.java deleted file mode 100644 index e03ae07..0000000 --- a/app/src/main/java/de/overview/wg/its/misp_authentificator/PreferenceManager.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.overview.wg.its.misp_authentificator; - -import android.content.Context; -import android.content.SharedPreferences; - -public class PreferenceManager { - - private static PreferenceManager instance; - private Context context; - private SharedPreferences sharedPreferences; - - private String PREF_KEY_SERVER_URL; - private String PREF_KEY_SERVER_API_KEY; - - private PreferenceManager(Context context) { - this.context = context; - sharedPreferences = android.preference.PreferenceManager.getDefaultSharedPreferences(context); - - PREF_KEY_SERVER_URL = context.getResources().getString(R.string.key_server_url); - PREF_KEY_SERVER_API_KEY = context.getResources().getString(R.string.key_server_api_key); - } - - public String getMyServerUrl() { - return sharedPreferences.getString(PREF_KEY_SERVER_URL, ""); - } - public void setMyServerUrl(String serverUrl) { - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(PREF_KEY_SERVER_URL, serverUrl); - editor.apply(); - } - - public String getMyServerApiKey() { - return sharedPreferences.getString(PREF_KEY_SERVER_API_KEY, ""); - } - public void setMyServerApiKey(String apiKey) { - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(PREF_KEY_SERVER_API_KEY, apiKey); - editor.apply(); - } - - public void deleteAllLocalData() { - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.clear(); - editor.apply(); - } - - public static PreferenceManager Instance(Context context) { - if(instance == null) { - instance = new PreferenceManager(context); - } - - return instance; - } -} diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java b/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java deleted file mode 100644 index 0c6607e..0000000 --- a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SyncActivity.java +++ /dev/null @@ -1,48 +0,0 @@ -package de.overview.wg.its.misp_authentificator.activity; - -import android.graphics.Bitmap; -import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.View; -import android.view.ViewTreeObserver; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.TextView; - -import net.glxn.qrgen.android.QRCode; - -import java.lang.reflect.Field; - -import de.overview.wg.its.misp_authentificator.R; - -public class SyncActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_sync); - - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setDisplayShowHomeEnabled(true); - - generateMyQR(); - } - - private void generateMyQR() { -// ImageView qrImageView = findViewById(R.id.sync_my_qr); - - Bitmap myBitmap = QRCode.from("This is my organisation information!") - .withColor(0xFF000000, 0x00000000) - .withSize(512,512) - .bitmap(); - -// qrImageView.setImageBitmap(myBitmap); - } -} diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/adapter/ExtOrgAdapter.java b/app/src/main/java/de/overview/wg/its/misp_authentificator/adapter/ExtOrgAdapter.java deleted file mode 100644 index ba95915..0000000 --- a/app/src/main/java/de/overview/wg/its/misp_authentificator/adapter/ExtOrgAdapter.java +++ /dev/null @@ -1,48 +0,0 @@ -package de.overview.wg.its.misp_authentificator.adapter; - -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import de.overview.wg.its.misp_authentificator.R; - -public class ExtOrgAdapter extends RecyclerView.Adapter { - - private String[] dataSet; - - public ExtOrgAdapter(String[] dataSet) { - this.dataSet = dataSet; - } - - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - - View extOrgView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.view_holder_ext_org, parent, false); - - return new ViewHolder(extOrgView); - } - - @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { - holder.orgTitle.setText(dataSet[position]); - } - - @Override - public int getItemCount() { - return dataSet.length; - } - - public static class ViewHolder extends RecyclerView.ViewHolder { - - public TextView orgTitle; - - public ViewHolder(View v) { - super(v); - orgTitle = v.findViewById(R.id.ext_org_title); - } - } -} diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/MainActivity.java b/app/src/main/java/de/overview/wg/its/mispauth/activity/MainActivity.java similarity index 51% rename from app/src/main/java/de/overview/wg/its/misp_authentificator/activity/MainActivity.java rename to app/src/main/java/de/overview/wg/its/mispauth/activity/MainActivity.java index f84cbf3..23703c1 100644 --- a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/MainActivity.java +++ b/app/src/main/java/de/overview/wg/its/mispauth/activity/MainActivity.java @@ -1,9 +1,10 @@ -package de.overview.wg.its.misp_authentificator.activity; +package de.overview.wg.its.mispauth.activity; import android.content.Intent; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -11,47 +12,25 @@ import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.ImageView; - -import de.overview.wg.its.misp_authentificator.PreferenceManager; -import de.overview.wg.its.misp_authentificator.R; -import de.overview.wg.its.misp_authentificator.adapter.ExtOrgAdapter; +import de.overview.wg.its.mispauth.R; +import de.overview.wg.its.mispauth.adapter.ExtOrgAdapter; +import de.overview.wg.its.mispauth.auxiliary.PreferenceManager; +import de.overview.wg.its.mispauth.model.Organisation; public class MainActivity extends AppCompatActivity { - PreferenceManager preferenceManager; + private Organisation[] externalOrganisations; @Override protected void onCreate(Bundle savedInstanceState) { - - preferenceManager = PreferenceManager.Instance(this); - super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - RecyclerView orgRecyclerView = findViewById(R.id.orgRecyclerView); - orgRecyclerView.setHasFixedSize(true); - - RecyclerView.LayoutManager orgLayoutManager = new LinearLayoutManager(this); - orgRecyclerView.setLayoutManager(orgLayoutManager); - - DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(orgRecyclerView.getContext(), 1); - orgRecyclerView.addItemDecoration(dividerItemDecoration); - - String[] dataSet = {}; - RecyclerView.Adapter orgAdapter = new ExtOrgAdapter(dataSet); - orgRecyclerView.setAdapter(orgAdapter); - - if(dataSet.length == 0){ - orgRecyclerView.setVisibility(View.GONE); - findViewById(R.id.empty_view).setVisibility(View.VISIBLE); - } else { - orgRecyclerView.setVisibility(View.VISIBLE); - findViewById(R.id.empty_view).setVisibility(View.GONE); - } + getExternalOrganisations(); + setUpRecyclerView(); FloatingActionButton fabAdd = findViewById(R.id.fab_add); final FloatingActionButton fabSync = findViewById(R.id.fab_sync); @@ -80,7 +59,6 @@ public class MainActivity extends AppCompatActivity { getMenuInflater().inflate(R.menu.menu_main, menu); return true; } - @Override public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); @@ -93,6 +71,47 @@ public class MainActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + private void setUpRecyclerView() { + RecyclerView orgRecyclerView = findViewById(R.id.orgRecyclerView); + orgRecyclerView.setHasFixedSize(true); + + RecyclerView.LayoutManager orgLayoutManager = new LinearLayoutManager(this); + orgRecyclerView.setLayoutManager(orgLayoutManager); + + DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(orgRecyclerView.getContext(), 1); + orgRecyclerView.addItemDecoration(dividerItemDecoration); + + RecyclerView.Adapter orgAdapter = new ExtOrgAdapter(this, externalOrganisations); + orgRecyclerView.setAdapter(orgAdapter); + + if(externalOrganisations.length == 0){ + orgRecyclerView.setVisibility(View.GONE); + findViewById(R.id.empty_view).setVisibility(View.VISIBLE); + } else { + orgRecyclerView.setVisibility(View.VISIBLE); + findViewById(R.id.empty_view).setVisibility(View.GONE); + } + + final SwipeRefreshLayout refreshLayout = findViewById(R.id.recycler_refresh); + refreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + // TODO do stuff + // refreshLayout.setRefreshing(false); + } + }); + } + + private void getExternalOrganisations(){ + Organisation a = new Organisation(); + a.setName("Ferrari"); + a.setDescription("Ferrari has nothing to share"); + a.setSector("Fast cars"); + a.setNationality("Italy"); + a.setUserCount(67); + + externalOrganisations = new Organisation[] {a}; + } private void startSyncActivity(){ startActivity(new Intent(this, SyncActivity.class)); diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SettingsActivity.java b/app/src/main/java/de/overview/wg/its/mispauth/activity/SettingsActivity.java similarity index 54% rename from app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SettingsActivity.java rename to app/src/main/java/de/overview/wg/its/mispauth/activity/SettingsActivity.java index 5524def..b4ac54b 100644 --- a/app/src/main/java/de/overview/wg/its/misp_authentificator/activity/SettingsActivity.java +++ b/app/src/main/java/de/overview/wg/its/mispauth/activity/SettingsActivity.java @@ -1,38 +1,40 @@ -package de.overview.wg.its.misp_authentificator.activity; +package de.overview.wg.its.mispauth.activity; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.design.widget.TextInputLayout; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ProgressBar; - -import com.android.volley.AuthFailureError; -import com.android.volley.NoConnectionError; +import android.widget.TextView; import com.android.volley.VolleyError; - -import org.json.JSONException; +import de.overview.wg.its.mispauth.R; +import de.overview.wg.its.mispauth.auxiliary.PreferenceManager; +import de.overview.wg.its.mispauth.auxiliary.ReadableError; +import de.overview.wg.its.mispauth.model.Organisation; +import de.overview.wg.its.mispauth.model.User; +import de.overview.wg.its.mispauth.network.MispRequest; import org.json.JSONObject; -import de.overview.wg.its.misp_authentificator.PreferenceManager; -import de.overview.wg.its.misp_authentificator.R; -import de.overview.wg.its.misp_authentificator.network.MispRequest; - public class SettingsActivity extends AppCompatActivity { - private static final String TAG = "MISP-TAG"; + private static final String TAG = "DEBUG"; private PreferenceManager preferenceManager; private ProgressBar progressBar; private TextInputLayout serverUrlLayout, apiKeyLayout; private EditText serverUrlText, apiKeyText; + private Organisation org; + private User user; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -48,18 +50,26 @@ public class SettingsActivity extends AppCompatActivity { apiKeyLayout = findViewById(R.id.input_layout_api_key); serverUrlText = findViewById(R.id.edit_server_url); apiKeyText = findViewById(R.id.edit_api_key); - progressBar = findViewById(R.id.progressBar); - FloatingActionButton fabDlOrgInfo = findViewById(R.id.fab_download_own_org_info); - - fabDlOrgInfo.setOnClickListener(new View.OnClickListener() { + findViewById(R.id.fab_download_own_org_info).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { downloadMyOrgInfo(); } }); + apiKeyText.setOnKeyListener(new View.OnKeyListener() { + public boolean onKey(View v, int keyCode, KeyEvent event) { + if (keyCode == 66) { + hideKeyboard(v); + apiKeyText.clearFocus(); + return true; + } + return false; + } + }); + restoreSavedValues(); } @@ -68,7 +78,6 @@ public class SettingsActivity extends AppCompatActivity { getMenuInflater().inflate(R.menu.menu_settings, menu); return true; } - @Override public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); @@ -83,15 +92,39 @@ public class SettingsActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } + private void setOrganisation(Organisation org) { + + if(org == null) { + return; + } + + TextView title = findViewById(R.id.organisation_title); + TextView uuid = findViewById(R.id.organisation_uuid); + TextView description = findViewById(R.id.organisation_description); + TextView nationality = findViewById(R.id.organisation_nationality); + TextView sector = findViewById(R.id.organisation_sector); + TextView userCount = findViewById(R.id.organisation_user_count); + + title.setText(org.getName()); + uuid.setText(org.getUuid()); + description.setText(org.getDescription()); + nationality.setText(org.getNationality()); + sector.setText(org.getSector()); + userCount.setText("" + org.getUserCount()); + } private void restoreSavedValues() { preferenceManager = PreferenceManager.Instance(this); serverUrlText.setText(preferenceManager.getMyServerUrl()); apiKeyText.setText(preferenceManager.getMyServerApiKey()); + + setOrganisation(preferenceManager.getMyOrganisation()); } private void downloadMyOrgInfo(){ + user = new User(); + org = new Organisation(); boolean failed = false; @@ -110,70 +143,69 @@ public class SettingsActivity extends AppCompatActivity { if(failed) { return; + } else { + serverUrlLayout.setError(null); + apiKeyLayout.setError(null); } final MispRequest request = MispRequest.Instance(this); - request.setServerCredentials(tmpServerUrl, tmpApiKey); progressBar.setVisibility(View.VISIBLE); request.myUserInformation(new MispRequest.UserInformationCallback() { + @Override public void onResult(JSONObject myUserInformation) { - int orgID; + user.fromJSON(myUserInformation); + preferenceManager.setMyUser(user); - try { - orgID = myUserInformation.getInt("org_id"); + int orgID = user.getOrgId(); - request.OrganisationInformation(orgID, new MispRequest.OrganisationInformationCallback() { - @Override - public void onResult(JSONObject organisationInformation) { - progressBar.setVisibility(View.GONE); - Log.i(TAG, "onResult: " + organisationInformation.toString()); - } + request.OrganisationInformation(orgID, new MispRequest.OrganisationInformationCallback() { - @Override - public void onError(VolleyError volleyError) { - progressBar.setVisibility(View.GONE); - Log.e(TAG, "onError: " + volleyError.toString()); - } - }); + @Override + public void onResult(JSONObject organisationInformation) { + progressBar.setVisibility(View.GONE); - } catch (JSONException e) { - e.printStackTrace(); - } + org.fromJSON(organisationInformation); + + preferenceManager.setMyOrganisation(org); + + setOrganisation(org); + } + + @Override + public void onError(VolleyError volleyError) { + progressBar.setVisibility(View.GONE); + MakeSnackbar(ReadableError.toReadable(volleyError)); + Log.e(TAG, "onError: " + volleyError.toString()); + } + }); } @Override public void onError(VolleyError volleyError) { progressBar.setVisibility(View.GONE); - - if(volleyError instanceof NoConnectionError) { - MakeAlert("No connection to server"); - } else if(volleyError instanceof AuthFailureError) { - MakeAlert("Wrong API key"); - } + MakeSnackbar(ReadableError.toReadable(volleyError)); } }); // If auth was successful: save new credentials preferenceManager.setMyServerUrl(tmpServerUrl); preferenceManager.setMyServerApiKey(tmpApiKey); - } - private void MakeAlert(String msg){ - + private void MakeSnackbar(String msg){ View contextView = findViewById(R.id.coordinator); - - Snackbar.make(contextView, msg, Snackbar.LENGTH_LONG) - .addCallback(new Snackbar.Callback(){ - @Override - public void onShown(Snackbar sb) { - progressBar.setVisibility(View.GONE); - } - }).show(); + Snackbar.make(contextView, msg, Snackbar.LENGTH_LONG).show(); } + + private void hideKeyboard(View view) { + InputMethodManager manager = (InputMethodManager) view.getContext().getSystemService(INPUT_METHOD_SERVICE); + if (manager != null) { + manager.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + } } diff --git a/app/src/main/java/de/overview/wg/its/mispauth/activity/SyncActivity.java b/app/src/main/java/de/overview/wg/its/mispauth/activity/SyncActivity.java new file mode 100644 index 0000000..4f7477c --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/activity/SyncActivity.java @@ -0,0 +1,14 @@ +package de.overview.wg.its.mispauth.activity; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import de.overview.wg.its.mispauth.R; + +public class SyncActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sync); + } +} diff --git a/app/src/main/java/de/overview/wg/its/mispauth/adapter/ExtOrgAdapter.java b/app/src/main/java/de/overview/wg/its/mispauth/adapter/ExtOrgAdapter.java new file mode 100644 index 0000000..4c623ec --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/adapter/ExtOrgAdapter.java @@ -0,0 +1,65 @@ +package de.overview.wg.its.mispauth.adapter; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.RelativeLayout; +import android.widget.TextView; +import de.overview.wg.its.mispauth.R; +import de.overview.wg.its.mispauth.auxiliary.OrganisationDialog; +import de.overview.wg.its.mispauth.model.Organisation; + +public class ExtOrgAdapter extends RecyclerView.Adapter { + + private Context context; + private Organisation[] dataSet; + + public ExtOrgAdapter(Context context, Organisation[] dataSet) { + this.context = context; + this.dataSet = dataSet; + } + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View extOrgView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_holder_ext_org, parent, false); + return new ViewHolder(extOrgView); + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { + holder.orgTitle.setText(dataSet[position].getName()); + holder.subTitle.setText(dataSet[position].getDescription()); + + holder.parentLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + OrganisationDialog d = new OrganisationDialog(context); + d.createDialog(dataSet[position]); + } + }); + } + + @Override + public int getItemCount() { + return dataSet.length; + } + + public static class ViewHolder extends RecyclerView.ViewHolder{ + + RelativeLayout parentLayout; + TextView orgTitle; + TextView subTitle; + + public ViewHolder(View v) { + super(v); + parentLayout = v.findViewById(R.id.parent_layout); + orgTitle = v.findViewById(R.id.ext_org_title); + subTitle = v.findViewById(R.id.ext_org_sub_title); + } + } +} diff --git a/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/OrganisationDialog.java b/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/OrganisationDialog.java new file mode 100644 index 0000000..5c340eb --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/OrganisationDialog.java @@ -0,0 +1,45 @@ +package de.overview.wg.its.mispauth.auxiliary; + +import android.app.Activity; +import android.content.Context; +import android.support.v7.app.AlertDialog; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.TextView; +import de.overview.wg.its.mispauth.R; +import de.overview.wg.its.mispauth.model.Organisation; + +public class OrganisationDialog { + + private AlertDialog.Builder dialogBuilder; + private LayoutInflater inflater; + + public OrganisationDialog(Context context) { + dialogBuilder = new AlertDialog.Builder(context); + inflater = ((Activity)context).getLayoutInflater(); + } + + public void createDialog(Organisation org) { + + View dialogContent = inflater.inflate(R.layout.view_holder_organisation, null); + dialogBuilder.setView(dialogContent); + + TextView title = dialogContent.findViewById(R.id.organisation_title); + title.setText(org.getName()); + + TextView description = dialogContent.findViewById(R.id.organisation_description); + description.setText(org.getDescription()); + + TextView sector = dialogContent.findViewById(R.id.organisation_sector); + sector.setText(org.getSector()); + + TextView nationality = dialogContent.findViewById(R.id.organisation_nationality); + nationality.setText(org.getNationality()); + + TextView userCount = dialogContent.findViewById(R.id.organisation_user_count); + userCount.setText("" + org.getUserCount()); + + dialogBuilder.setPositiveButton("OK", null); + dialogBuilder.show(); + } +} diff --git a/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/PreferenceManager.java b/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/PreferenceManager.java new file mode 100644 index 0000000..9efd6b2 --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/PreferenceManager.java @@ -0,0 +1,95 @@ +package de.overview.wg.its.mispauth.auxiliary; + +import android.content.Context; +import android.content.SharedPreferences; +import de.overview.wg.its.mispauth.model.Organisation; +import de.overview.wg.its.mispauth.model.User; +import org.json.JSONException; +import org.json.JSONObject; + +public class PreferenceManager { + + private static PreferenceManager instance; + private SharedPreferences sharedPreferences; + + private static String PREF_KEY_SERVER_URL = "key_server_url"; + private static String PREF_KEY_SERVER_API_KEY = "key_server_api_key"; + private static String PREF_KEY_MY_ORGANISATION = "key_my_organisation"; + private static String PREF_KEY_MY_USER = "key_my_user"; + + private PreferenceManager(Context context) { + sharedPreferences = android.preference.PreferenceManager.getDefaultSharedPreferences(context); + } + + /** + * @return own Organisation if available, else null + */ + public Organisation getMyOrganisation() { + try { + JSONObject jsonObject = new JSONObject(sharedPreferences.getString(PREF_KEY_MY_ORGANISATION, "")); + Organisation org = new Organisation(); + org.fromJSON(jsonObject); + return org; + } catch (JSONException e) { + e.printStackTrace(); + } + + return null; + } + public void setMyOrganisation(Organisation org) { + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString(PREF_KEY_MY_ORGANISATION, org.toJSON().toString()); + editor.apply(); + } + + public User getMyUser() { + try { + JSONObject jsonObject = new JSONObject(sharedPreferences.getString(PREF_KEY_MY_USER, "")); + User user = new User(); + user.fromJSON(jsonObject); + return user; + } catch (JSONException e) { + e.printStackTrace(); + } + + return null; + } + public void setMyUser(User user) { + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString(PREF_KEY_MY_USER, user.toJSON().toString()); + editor.apply(); + } + + public String getMyServerUrl() { + return sharedPreferences.getString(PREF_KEY_SERVER_URL, ""); + } + public void setMyServerUrl(String serverUrl) { + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString(PREF_KEY_SERVER_URL, serverUrl); + editor.apply(); + } + + public String getMyServerApiKey() { + return sharedPreferences.getString(PREF_KEY_SERVER_API_KEY, ""); + } + public void setMyServerApiKey(String apiKey) { + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString(PREF_KEY_SERVER_API_KEY, apiKey); + editor.apply(); + } + + public void deleteAllLocalData() { + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.clear(); + editor.apply(); + } + + public static PreferenceManager Instance(Context context) { + if(instance == null) { + instance = new PreferenceManager(context); + } + + return instance; + } +} + diff --git a/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/ReadableError.java b/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/ReadableError.java new file mode 100644 index 0000000..9484723 --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/auxiliary/ReadableError.java @@ -0,0 +1,19 @@ +package de.overview.wg.its.mispauth.auxiliary; + +import com.android.volley.AuthFailureError; +import com.android.volley.NoConnectionError; +import com.android.volley.VolleyError; + +public class ReadableError { + + public static String toReadable(VolleyError volleyError) { + + if(volleyError instanceof NoConnectionError) { + return "Connection failed"; + } else if(volleyError instanceof AuthFailureError) { + return "Authentication failed"; + } + + return "Unknown error"; + } +} diff --git a/app/src/main/java/de/overview/wg/its/mispauth/model/Organisation.java b/app/src/main/java/de/overview/wg/its/mispauth/model/Organisation.java new file mode 100644 index 0000000..aaa4fa5 --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/model/Organisation.java @@ -0,0 +1,186 @@ +package de.overview.wg.its.mispauth.model; + +import org.json.JSONException; +import org.json.JSONObject; + +public class Organisation { + + private static String ID_KEY = "id"; + private static String NAME_KEY = "name"; + private static String DATE_CREATED_KEY = "date_created"; + private static String DATE_MODIFIED_KEY = "date_modified"; + private static String TYPE_KEY = "type"; + private static String NATIONALITY_KEY = "nationality"; + private static String SECTOR_KEY = "sector"; + private static String CONTACTS_KEY = "contacts"; + private static String DESCRIPTION_KEY = "description"; + private static String LOCAL_KEY = "local"; + private static String UUID_KEY = "uuid"; + private static String RESTRICTED_TO_DOMAIN_KEY = "restricted_to_domain"; + private static String CREATED_BY_KEY = "created_by"; + private static String USER_COUNT_KEY = "user_count"; + + private int id; + private String name; + private String dateCreated, dateModified; + private String type; + private String nationality; + private String sector; + private String contacts; + private String description; + private boolean local; + private String uuid; + private String restrictedToDomain; + private int createdBy; + private int userCount; + + public Organisation() {} + + public void fromJSON(JSONObject org) { + + try { + id = org.getInt(ID_KEY); + dateCreated = org.getString(DATE_CREATED_KEY); + dateModified = org.getString(DATE_MODIFIED_KEY); + name = org.getString(NAME_KEY); + type = org.getString(TYPE_KEY); + nationality = org.getString(NATIONALITY_KEY); + sector = org.getString(SECTOR_KEY); + contacts = org.getString(CONTACTS_KEY); + description = org.getString(DESCRIPTION_KEY); + local = org.getBoolean(LOCAL_KEY); + uuid = org.getString(UUID_KEY); + restrictedToDomain = org.getString(RESTRICTED_TO_DOMAIN_KEY); + createdBy = org.getInt(CREATED_BY_KEY); + userCount = org.getInt(USER_COUNT_KEY); + + } catch (JSONException e) { + e.printStackTrace(); + } + } + + public JSONObject toJSON() { + JSONObject org = new JSONObject(); + + try { + org.put(ID_KEY, id); + org.put(NAME_KEY, name); + org.put(DATE_CREATED_KEY, dateCreated); + org.put(DATE_MODIFIED_KEY, dateModified); + org.put(TYPE_KEY, type); + org.put(NATIONALITY_KEY, nationality); + org.put(SECTOR_KEY, sector); + org.put(CONTACTS_KEY, contacts); + org.put(DESCRIPTION_KEY, description); + org.put(LOCAL_KEY, local); + org.put(UUID_KEY, uuid); + org.put(RESTRICTED_TO_DOMAIN_KEY, restrictedToDomain); + org.put(CREATED_BY_KEY, createdBy); + org.put(USER_COUNT_KEY, userCount); + + } catch (JSONException e) { + e.printStackTrace(); + } + + return org; + } + + + public void setName(String name) { + this.name = name; + } + public String getName(){ + return name; + } + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + public String getSector() { + return sector; + } + public void setSector(String sector) { + this.sector = sector; + } + + public String getNationality() { + return nationality; + } + public void setNationality(String nationality) { + this.nationality = nationality; + } + + public int getId() { + return id; + } + public void setId(int id) { + this.id = id; + } + + public String getDateCreated() { + return dateCreated; + } + public void setDateCreated(String dateCreated) { + this.dateCreated = dateCreated; + } + + public String getDateModified() { + return dateModified; + } + public void setDateModified(String dateModified) { + this.dateModified = dateModified; + } + + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + + public String getContacts() { + return contacts; + } + public void setContacts(String contacts) { + this.contacts = contacts; + } + + public boolean isLocal() { + return local; + } + public void setLocal(boolean local) { + this.local = local; + } + + public String getUuid() { + return uuid; + } + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getRestrictedToDomain() { + return restrictedToDomain; + } + public void setRestrictedToDomain(String restrictedToDomain) { + this.restrictedToDomain = restrictedToDomain; + } + + public int getCreatedBy() { + return createdBy; + } + public void setCreatedBy(int createdBy) { + this.createdBy = createdBy; + } + + public int getUserCount() { + return userCount; + } + public void setUserCount(int userCount) { + this.userCount = userCount; + } +} diff --git a/app/src/main/java/de/overview/wg/its/mispauth/model/User.java b/app/src/main/java/de/overview/wg/its/mispauth/model/User.java new file mode 100644 index 0000000..bb06663 --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispauth/model/User.java @@ -0,0 +1,298 @@ +package de.overview.wg.its.mispauth.model; + +import org.json.JSONException; +import org.json.JSONObject; + +public class User { + + private static String ID_KEY = "id"; + private static String PASSWORD_KEY = "password"; + private static String ORG_ID_KEY = "org_id"; + private static String EMAIL_KEY = "email"; + private static String AUTOALERT_KEY = "autoalert"; + private static String AUTHKEY_KEY = "authkey"; + private static String INVITED_BY_KEY = "invited_by"; + private static String GPGKEY_KEY = "gpgkey"; + private static String CERTIF_PUBLIC = "certif_public"; + private static String NIDS_SID = "nids_sid"; + private static String TERMS_ACCEPTED_KEY = "termsaccepted"; + private static String NEWSREAD_KEY = "newsread"; + private static String ROLE_ID_KEY = "role_id"; + private static String CHANGE_PW_KEY = "change_pw"; + private static String CONTACT_ALERT_KEY = "contactalert"; + private static String DISABLED_KEY = "disabled"; + private static String EXPIRATION_KEY = "expiration"; + private static String CURRENT_LOGIN_KEY = "current_login"; + private static String LAST_LOGIN_KEY = "last_login"; + private static String FORCE_LOGOUT_KEY = "force_logout"; + private static String DATE_CREATED_KEY = "date_created"; + private static String DATE_MODIFIED_KEY = "date_modified"; + + private int id; + private String password; + private int orgId; + private String email; + private boolean autoAlert; + private String authkey; + private int invitedBy; + private String gpgKey; + private String certifPublic; + private int nidsSid; + private boolean termsAccepted; + private int newsRead; // Integer?? + private int roleId; + private String changePw; + private boolean contactAlert; + private boolean disabled; + private String expiration; + private String currentLogin; + private String lastLogin; + private boolean forceLogout; + private String dateCreated; + private String dateModified; + + public User() {} + + public void fromJSON(JSONObject user) { + try { + + id = user.getInt(ID_KEY); + password = user.getString(PASSWORD_KEY); + orgId = user.getInt(ORG_ID_KEY); + email = user.getString(EMAIL_KEY); + autoAlert = user.getBoolean(AUTOALERT_KEY); + authkey = user.getString(AUTHKEY_KEY); + invitedBy = user.getInt(INVITED_BY_KEY); + gpgKey = user.getString(GPGKEY_KEY); + certifPublic = user.getString(CERTIF_PUBLIC); + nidsSid = user.getInt(NIDS_SID); + termsAccepted = user.getBoolean(TERMS_ACCEPTED_KEY); + newsRead = user.getInt(NEWSREAD_KEY); + roleId = user.getInt(ROLE_ID_KEY); + changePw = user.getString(CHANGE_PW_KEY); + contactAlert = user.getBoolean(CONTACT_ALERT_KEY); + disabled = user.getBoolean(DISABLED_KEY); + expiration = user.getString(EXPIRATION_KEY); + currentLogin = user.getString(CURRENT_LOGIN_KEY); + lastLogin = user.getString(LAST_LOGIN_KEY); + forceLogout = user.getBoolean(FORCE_LOGOUT_KEY); + dateCreated = user.getString(DATE_CREATED_KEY); + dateModified = user.getString(DATE_MODIFIED_KEY); + + } catch (JSONException e) { + e.printStackTrace(); + } + + } + + public JSONObject toJSON() { + JSONObject user = new JSONObject(); + + try { + + user.put(ID_KEY, id); + user.put(PASSWORD_KEY, password); + user.put(ORG_ID_KEY, orgId); + user.put(EMAIL_KEY, email); + user.put(AUTOALERT_KEY, autoAlert); + user.put(AUTHKEY_KEY, authkey); + user.put(INVITED_BY_KEY, invitedBy); + user.put(GPGKEY_KEY, gpgKey); + user.put(CERTIF_PUBLIC, certifPublic); + user.put(NIDS_SID, nidsSid); + user.put(TERMS_ACCEPTED_KEY, termsAccepted); + user.put(NEWSREAD_KEY, newsRead); + user.put(ROLE_ID_KEY, roleId); + user.put(CHANGE_PW_KEY, changePw); + user.put(CONTACT_ALERT_KEY, contactAlert); + user.put(DISABLED_KEY, disabled); + user.put(EXPIRATION_KEY, expiration); + user.put(CURRENT_LOGIN_KEY, currentLogin); + user.put(LAST_LOGIN_KEY, lastLogin); + user.put(FORCE_LOGOUT_KEY, forceLogout); + user.put(DATE_CREATED_KEY, dateCreated); + user.put(DATE_MODIFIED_KEY, dateModified); + + } catch (JSONException e) { + e.printStackTrace(); + } + + return user; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public int getOrgId() { + return orgId; + } + + public void setOrgId(int orgId) { + this.orgId = orgId; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public boolean isAutoAlert() { + return autoAlert; + } + + public void setAutoAlert(boolean autoAlert) { + this.autoAlert = autoAlert; + } + + public String getAuthkey() { + return authkey; + } + + public void setAuthkey(String authkey) { + this.authkey = authkey; + } + + public int getInvitedBy() { + return invitedBy; + } + + public void setInvitedBy(int invitedBy) { + this.invitedBy = invitedBy; + } + + public String getGpgKey() { + return gpgKey; + } + + public void setGpgKey(String gpgKey) { + this.gpgKey = gpgKey; + } + + public String getCertifPublic() { + return certifPublic; + } + + public void setCertifPublic(String certifPublic) { + this.certifPublic = certifPublic; + } + + public int getNidsSid() { + return nidsSid; + } + + public void setNidsSid(int nidsSid) { + this.nidsSid = nidsSid; + } + + public boolean isTermsAccepted() { + return termsAccepted; + } + + public void setTermsAccepted(boolean termsAccepted) { + this.termsAccepted = termsAccepted; + } + + public int getNewsRead() { + return newsRead; + } + + public void setNewsRead(int newsRead) { + this.newsRead = newsRead; + } + + public int getRoleId() { + return roleId; + } + + public void setRoleId(int roleId) { + this.roleId = roleId; + } + + public String getChangePw() { + return changePw; + } + + public void setChangePw(String changePw) { + this.changePw = changePw; + } + + public boolean isContactAlert() { + return contactAlert; + } + + public void setContactAlert(boolean contactAlert) { + this.contactAlert = contactAlert; + } + + public boolean isDisabled() { + return disabled; + } + + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + + public String getExpiration() { + return expiration; + } + + public void setExpiration(String expiration) { + this.expiration = expiration; + } + + public String getCurrentLogin() { + return currentLogin; + } + + public void setCurrentLogin(String currentLogin) { + this.currentLogin = currentLogin; + } + + public String getLastLogin() { + return lastLogin; + } + + public void setLastLogin(String lastLogin) { + this.lastLogin = lastLogin; + } + + public boolean isForceLogout() { + return forceLogout; + } + + public void setForceLogout(boolean forceLogout) { + this.forceLogout = forceLogout; + } + + public String getDateCreated() { + return dateCreated; + } + + public void setDateCreated(String dateCreated) { + this.dateCreated = dateCreated; + } + + public String getDateModified() { + return dateModified; + } + + public void setDateModified(String dateModified) { + this.dateModified = dateModified; + } +} diff --git a/app/src/main/java/de/overview/wg/its/misp_authentificator/network/MispRequest.java b/app/src/main/java/de/overview/wg/its/mispauth/network/MispRequest.java similarity index 97% rename from app/src/main/java/de/overview/wg/its/misp_authentificator/network/MispRequest.java rename to app/src/main/java/de/overview/wg/its/mispauth/network/MispRequest.java index 55dd79a..2005fcb 100644 --- a/app/src/main/java/de/overview/wg/its/misp_authentificator/network/MispRequest.java +++ b/app/src/main/java/de/overview/wg/its/mispauth/network/MispRequest.java @@ -1,24 +1,21 @@ -package de.overview.wg.its.misp_authentificator.network; +package de.overview.wg.its.mispauth.network; import android.content.Context; import android.support.annotation.Nullable; import android.util.Log; - import com.android.volley.Request; import com.android.volley.RequestQueue; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; import com.android.volley.toolbox.Volley; - +import de.overview.wg.its.mispauth.auxiliary.PreferenceManager; import org.json.JSONException; import org.json.JSONObject; import java.util.HashMap; import java.util.Map; -import de.overview.wg.its.misp_authentificator.PreferenceManager; - /** * Simple JSON based API to communicate with MISP-Instances */ @@ -33,7 +30,6 @@ public class MispRequest { private String serverUrl, apiKey; /** - * * @param context for Volley and PreferenceManager */ private MispRequest(Context context) { @@ -42,7 +38,6 @@ public class MispRequest { } /** - * * @param orgId organisation ID on the MISP-Instance * @param callback returns a single Organisation-JSON */ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6cf2f56..c446141 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,81 +1,92 @@ + tools:context=".activity.SettingsActivity" + android:background="@color/colorPrimary"> + android:id="@+id/settings.appbar" + app:elevation="0dp" + android:background="@color/colorPrimaryDark" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:backgroundTint="@color/colorPrimary" + android:background="@drawable/background_rounded_main" + app:popupTheme="@style/AppTheme.PopupOverlay"/> - - + android:layout_height="match_parent" + android:background="@drawable/background_rounded_main" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + android:id="@+id/empty_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:layout_marginEnd="16dp" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:text="@string/empty_ext_org_dataset" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> + + + + + + + + android:id="@+id/fab_add" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/fab_margin" + app:fabSize="normal" + app:layout_anchor="@+id/constraintLayout" + app:layout_anchorGravity="right|bottom" + app:srcCompat="@drawable/ic_add_white"/> + android:id="@+id/fab_sync" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="100dp" + android:visibility="gone" + app:fabSize="mini" + app:layout_anchor="@+id/fab_add" + app:layout_anchorGravity="top|center_horizontal" + app:srcCompat="@drawable/ic_sync_white"/> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3e99ae2..aa439e7 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -77,7 +77,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/background_rounded_main" - android:padding="16dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/view_holder_ext_org.xml b/app/src/main/res/layout/view_holder_ext_org.xml index 1006af7..b9d507a 100644 --- a/app/src/main/res/layout/view_holder_ext_org.xml +++ b/app/src/main/res/layout/view_holder_ext_org.xml @@ -1,33 +1,29 @@ - - + android:padding="16dp" + android:clickable="true" + android:focusable="true"> + android:id="@+id/ext_org_title" + android:layout_marginEnd="40dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:text="Title" + android:textSize="20sp" + android:textStyle="bold"/> - + \ No newline at end of file diff --git a/app/src/main/res/layout/view_holder_organisation.xml b/app/src/main/res/layout/view_holder_organisation.xml new file mode 100644 index 0000000..b975fa5 --- /dev/null +++ b/app/src/main/res/layout/view_holder_organisation.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 834fd0e..792af37 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,19 +1,14 @@ - MISPauth + MISPauth - No External Organisations available - No Local Information Available + No External Organisations available + No Local Information Available - // Settings + // Settings - Server URL - API Key - Settings - Synchronise - - // Preferences - - key_server_url - key_server_api_key + Server URL + API Key + Settings + Synchronise diff --git a/app/src/test/java/de/overview/wg/its/misp_authentificator/ExampleUnitTest.java b/app/src/test/java/de/overview/wg/its/mispauth/ExampleUnitTest.java similarity index 76% rename from app/src/test/java/de/overview/wg/its/misp_authentificator/ExampleUnitTest.java rename to app/src/test/java/de/overview/wg/its/mispauth/ExampleUnitTest.java index 6914031..fc9a8ef 100644 --- a/app/src/test/java/de/overview/wg/its/misp_authentificator/ExampleUnitTest.java +++ b/app/src/test/java/de/overview/wg/its/mispauth/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package de.overview.wg.its.misp_authentificator; +package de.overview.wg.its.mispauth; import org.junit.Test; @@ -11,7 +11,7 @@ import static org.junit.Assert.*; */ public class ExampleUnitTest { @Test - public void addition_isCorrect() { + public void addition_isCorrect() throws Exception { assertEquals(4, 2 + 2); } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee94c0ab25cf079ac8ccdf87f41d455d42..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 27523 zcmZ5{bC4%6v+dZnZQHhO+qQpW+qP|M$F_|f+cP`ZxA(qRb?^65l~htm_g`Jf={_f| zHK3s-pa@E`pkOdSKu}OXG|g#}NeG0f|Fc?8%Ty5r0s>M`5>n>HxxfZ_d2|5=`X397 ze-{6?fk6Ii_}9Sxbw?LVM$rH7OwtT7%>VWJUlvJk)c%eLw^wp;bTW5wvo?4AH}moqc6YNfcW|>dHFk4!VKB8bc6BXNwRc1j zMhd{7iWpx!sxqoe+gkHcJBfB&G{S+7i-KmBua=h+v^NH|toJl?OnPj1ja5Tlop>e2ct=;0I>UP?a zAdC;T2l>KHVj3J&>4$f!@|j7k43!&cRr>~cE%S3@JkkrkQk$#~L%bn&JwFGa$yK&v zGS?D5laedEnr|Shc$1LawHn@3w?n0_AJC-2tz8izHJ?6Fp^SKIBbra!OYc30ZKw2# zssTJ1ufYQ*a&n$vHL%ikMQ&8P45)HUGch6Ha21+g^&m^9dABL1?V0F<7)paa_%q>DtpSQ+fVO+>sE&^EE03%X;2J zb{^Q6jSFoKiSjMs6X1FcHGTqy%_qJ!xBfs ziAytDsYe4Mu=3@lza(uuSR_c)v}|3q(~?snLsj{znSWQba#dek8Du%j)h-%Z2m_o) zp6ixKb&B(3(+$ut+UJoz9Ph7v zHidP!J+Tn6k{wW3t5Pr(#&U4_hKZFHS0sCHo0MKyzTqq>=1gxFf7y98#+D z;LZs1pG9CyRA{WgW?|VlV)WrONyAP^ICGjNVBLfz0ayW(Q>`vdxn*YV>>Li%AH6oCTa0GUCc?O?ylndR(`G9oMY7DPxi-j^iq23dTg47| z+1RKq^tW|Zwmx*G0GzC1^Qv%sS*mUZzIL{mm_P3a-t4B!nFYkU9yzmE3CJl977}DD zUC9vemf`5bN-x33LB_F>a#c@<%&f4+kqfCHvnziQiJ*ZG=h>UbRAOtnFCngyIp#NS zv`0_}WhYK|=!A2e7*p%?Gyg_?*})U&;TzlX?7C$B5ndCW1#IKshWanooWPAT=&an? z$d6}OyxjY*j=C=mst;``o0}-fpIZp?YpX*FoKvXrr`HSDsTd|Q2V(+y$&Sr?NsO0e#4`?>#?19bY6A3VNBPN080hQ` zQ&q3f;?IiKHpTEU5%Y>k4(6#dFN@(P1Uv=zj%HCb-Kl+QC2B&71O)9T*B8k(!CI0Dq9Rq>P>^Xl+}Z3x(MgVt5lX#N>&eTH@a zmP$<@-17v)jQ-A4*M_&#v|*#c^y(U!Ac-}GEPsgKdK2Qd{880 z6nSTfSRRrhCRdzJ_P^}|Sdw~2RWJG1rvg()k1^y%9Xg` zyLzH_sMYe)j|`{{0^nC?1*i$2Ap0dD8Qc2D7!R}51is;BSu3%vVCu5QwmLbl^F*i& z00iZiJd%HI=Z$F^5PiFp%IqF-IQ05?Nw3*v3q1gI8~aVAu}IB0DNWdoOOhsAC8yEa7jGDrz0``?d& zvOm7{$v+%|4U=M^#s#=?MO8=pYoB8_>@i)UBqI|B1!DatG7#MkhGs#g43SKUF1TCX zF(u55(~hGR9lhXP;(G`#eppk0J7gGZaBjl$FV%}DXVGlTmW9u4-y#?PWE^5r&I`Z(?=!-PgEKT^<03)LwdMIESR%IJ+$J?h3T``0W;vU*XKlD5zoAu}*V1tk^DFW7nlgSuA*}`O|U*IUG+gKI3+j z=(5~nb`m3}_@sagR0X=GOi%IGR@0}0Y!bjyBbCPy3`a$%F0FbaD~rcwr^SdIFNcYR zSZ|LTU8e;Fhr@3xOt!kvD=5+$BDFGJn-drZX)*S&pf<*7Ny-S!WRkP&c5&?|^d>6T zhf?fenNceX9qQ{WY#pvh02~;f1#0V zSctMFSGcY0_Dk1^oB4{Fnq_TaS#8rqs5!C?@`4L`pnV-u0}wUqBsPO%8;-e4H(9jo zQ*|)IX+DN~;h(J{pT!U{CEda!_Uqb>^#H7H)2 z79I^I)|Tc;4@BPho6xi6As9aW zS#~_(U0T@f1~DsW<#hn04@DLMvt{Q3j{#FFcdI@TRFa~>Xgj*{kzE!Zz+!q<#)=&; zzS}S5-{Q93G$l1|`#jC)&i-9!o1tZwCDlj5UJOrCd5|m5``YU#XYhqT?-k-#Db1Vn zbPv!bFAGoL9OO<%st;{diKBzjt-*3}NVh~H^iT5{wX>-?W9e^ADnNpDJ8bDK!-+pB z@@!=Jb8I~<9a#fzOfDXRry*gD&v2{=+2}Zz>i$}R*E7hyL4a+q6&BaVca)5*F(vN{ z&nc6g{BieP@Q3kC890|SFlRFo27!~wFa;pWH^0v?F+f4(B9L@@NIj;0c$pv&`q)Fc zCyR5Rx!shY#z;*R>`;G&B#zi-Rm&HMDE#=NC9?c1%9bD=bN>wjnExh!pM;8K6wWI@ zI}md;M80}&*bNalPsvHVo8%9rOfOVqEK1wD+U7uON@CzZUtD`b$|-2I_YQrH+5?cZ z3rIu+3mZe1`5zZ9hy+A1MM8!oKqqvNS++mP; zLyji^S(<-A^07u2&&_@Mtw&P5egSx(5NvmF-q{@!-WiqcRGfw6x(?!j{4icom=@T> zki@((+1Zt#q-|%2mDR|>EG1XZKqj&h3w>e%?X@4 zHgLohJw%W@s)7gMFhbo&B&r;KLM6A^Zq|e{8sj_yP)@|xC8LDUJXOI{-buaDWvP{D z!Wb9!Ba2U%0$4t%z!AnA9XtDh6vQ5?I{V=iB#l~%cjJ$qnf>_Tjo&xJ8Acw(DEm=| zGmbBYHH_S=EB|D}8Di$_BVFV$`^laxfkX3ri|`^L5S6g z(Q%#tIO%O`QFVoz(Q8FTf+n-Q#I%FtYt97C1hCHMiAf z^J5K9^B-{Li0i>!I3^_kn!(st+NE$oy9NVLhx=foqFdURtre!_P5uo6C1`LyRhSW5Wr zQl;9-yUlwJ)UBgBN_YOYbM8S0cb{ExuOwWk^TR^``fhRJ9y?Ty}fdH{E?~1@1pVbsk?+IIQXNJeq9Z zX}h_215g$0Z9IkH#jQu6Qo=eeve$^v#C%C35=0(%{WY}pr`cVV(7@e&`C$oDXOAG zklQTtTFj7R_6GssWfB@4(@A;Mn~z{LK@IMBoF;#m9o^MSXH*sISbWbxdsOj0IvSkr zQD(guiwb+R*P-UU>ii2%&{CqACV;pG_Ps3HFzVU1xA0@`(7fNAn_oH4j3v>uRT^r2mCTbZ}pN)zhK}sLUSpv z!32A;Ep`HKfIVss4sp*cEUfG1)n?H*)!u)#{47+bIZY`)p~#ThDK)N7-6>Vf6KK*m zmY~`h-dEch504&@mAH-RIo*N)R2{+hO1psNC1AFUSgdDoUQ-cNzDJ;)gZxN4z_8Ad zOZSx?lF6RJmb=FoB|B!AfLH7t%9D4idD62ZuC;aoCpghpb)z+?=igi5BWqe12;cE` z9{>-O>UXWFIT82RbUWgUw)}vb3_mhMz!HiAcKdr<#@C-3`?hPgRa-&;$vIS{>-0IH zs`o)WNe1{;Cr;l24-0>-Edq`wy%SDJO!@kJB|LA!nJ-uZMB&Q1%g7~UXuW64x|}XA z1I2JAA@@kCatBiN$L&3?cPqQ`7^DPEne;GL;V0pPP|Lpj}$ z9_JJu=RPWmFG^;hkY`JEhig*c^jErvt;9pjqe|UPgw}Y*>5z*d>K2+JJ=Y<7FgF|w z&Ix+IWG9+1;Q8DEsER5!zqL~ow@l?`iC!c#gPCrwN2$u7*gtl_Cp&)uL~;|#q8giG zMbYsHWbvQ}f=XQDvZ}h2?pF9)>(^6n*wDlB2W0y$#N7^o&Ed)ZlLbRL+~^zU;l{ZL!XQPlZXCKlz)qICMHmJhL*^7|Nn1pGEc_lXR_ zftPGoFpAsEP!KbmFGW7}Ls_q~#$H)eR(r{Mt@2IcB&@tsy9nOCD8E~D33QxBpODJN z)cLL!a|(z7L5w+DCKYiX=L9#%r@7r5!V&ye{P;y@(^8uJ1QupSYQ_?!EaetsDMUXu z>Rau-?ZyQ2%aT|Th2DC~-u@#4YGM0aL4Py66#ij4VF&R;ZUMc%~r z`ORp(?z&US5B!eUF7lA;3pRg$kRsY73doiVNH(nVYK3^`62)JJ;ctoXg!(A~@A3lh z@1C^ABhuRZ(5C+We+5ylz4l#PR3M;hY9Jt@e^pM56ghT80IVO{Nt+;L&*moGFfG#1 zl&u(vcLXO661;Tc22$cZ6VauaXL9T{>Fr#ySe;Ic%xb@q?xIF*f(gC4vh)JghK+yw zYf)QU+p31GyiXk5S0m zsg->J0}0BOW;yYd1vCHnbPY6bEPuER>V`89e~-g34hB+BK3YD3*FCdQ`vnaZJi4|NtV>JE2F@M7EZITb zhxIBSt^w7ZJOu2K&Cf2WfqTI^s=t$jZJRB%1J#|~0NWhKpzk3UY8-A4WxRi=e00iX z(}cYMfZCjUhKhjf&pZSpzU|(-M1SAV9WZc+*Gzx+s^%jjQ&ct+`P=JB?IcNT2WSN)(rG5{$?Ixb{$EMqZef?K-05;V+yI zm+Ex&-6ucQ#I~J@RK|qCp8UA&{UuD&kv{7oR#D|1_q(ZzM-UF!dtHUcL0!8MXkqlylKA z;!|0++wxJsB>?u{&7xY6n9=73}8a;Hc}=_1WUxx~nUc$6q{}JcYnm_%n@6H?W5rhFD8MHoYm-*mp{C6M7^LT(jmDvz zI6fQFNz$}PKJ zSm94En+Li{;6Z)G)DY=WYMikJyyORD!EFyz=dqpwm&c2h1fr=`TF8pE(>|+m4(z5I z<%Mk(t#-I*v6Q-Q+S*6}4wCTF<l@I=qiMp+U=wK2h5Y7S_WNNGDnay~ zrO+c+JyYs+?b9A>6Uq4m_- zEnE>UrgZ4+&C+^ZEGh5NlCFxPZYETFyBR4VnborTt|>ig2x~?F`h++NMKLezCS(f1`_s{7yE^LvQ(1occ)Tz24mR5{{ z+%;)e+3+=#B6W5Qo$YW8#Gsr{`dR%s`Q+I*;5p&3A4<(Gn4V$&&jsc3ORrt-4Prf%=6+KSAucn$uMA ze06J%gVKf1pW2}w_5L77wGWEDlKZpY#};Xhhq~%NeEZQiA0sleptaKH{=z4Wj~RvH z^~q4@Yi;i8m8xhz%~QS~9AF-|p}9`r$Uee{+v@!x1I3R3%@2jNw+H4O2d8F(6X?B$$>v(dKrQopkoWBhrRD(GkCu4*K*m`4Eq zpC{)UA31&iA-LDXsr{pGIbH=Sv20Hix+9(E6zRgp;V=8NTjI=fB7o$Hq!IdUGc7%< zS%p6RUQyTNLea4B;j*j=c@xLrio1f^-E#M{e)yUL7W3><$!@cyEr0o{x;{#a?6a6! zOScX~6ZGXjThD(!wX1e>Io}BRT?nTkB|@8e?GNEEk01ouC|HV)1_s+; ziK^R12kDOx1jzD!Cmk?H>ny!wIfDGGYu{mK4ZoWOe`#gw6xuyMt|m7feGfbU6k}5h z9+PG2T0(w7pGg&8Q@z9Tw+0{Sc<3RzKq^a0+@b@lq?lnuUiyve4AtefWY4&I0SV{i z?{XGv187vAgJ$KiiSBJny&$w)JYn)-1%=f)5=~ivM1!^O#sgRX^@=8uCM$^5=V^)EO5QXV>t-VL22n6U zIO{yuM;fMFYY7(?ot`ea#n>|GCFoHH!xY1E<+VZhsEEsB-X~EIpEm`0x|_O98o@(v(85) zC1I?-D_#X81^L$(ttIDyD|+Qdwso*!NAqYsNF)_~9~XT-V>XFcDi&5CRtAe_os0P- zTni2h^vuPsi$`%!o{lEKFJjL4?%Jx!wqK1gm8gg2)wuLkfuzpNHUWq%J;D{LglWji z0^k=i-O-u#W10m1*)S(wac?5rw%dxi$v2eoGhPb6c5p8!T7B=`@u|EXay12nz)wQZ ztZ4B#vkVA`UYOz-8@S|TyibfD(=_qRp(E@N3PgQzJ{IOiW#Y;KOW29V1heHRy?N4{ zrlmVY(j5zRVy`(9Bdmh9?ZoIqDvlc@0{%)8Svt?OsoO^!H z?6t2ZC+kfRXX=uK4kCs?q?~99f+D}%L)>(9M}cOo9_XGF^2O%gZJ%O#y+5rj)R_hf zEEt|JyzjVwGNz3BE1+cNc$~gMrUJ6{Vd>9W;S)7#ywX1aF<-*_i=S4%%yCiX@Z+Kfy_W+0dUf+6Kt3s=84Ob1p+#2k07Cy=l|fKB=`65Eu3w zVM)*?$-GuX)JP!s<`-Y`$$(CzfELm&P!PGI6v_hw1bQm-eOv?gl2=Dzi^q>zMq42X#9HvQL#;j0VrKL1*4SZP)o5 zqlTvj)4`>L_(%8C`by(Bx-=AK8(yI`!nVB^{#mcV4#-B@3Clinau*ziL2!oXLLbz_ z7m`aPUx5&U^PmSbddV*0)jn*@ZiM_9Ai#IbM9iQ5D1d#fm2}7#>1>_2-%(iZPI81V zlFAF}H2|xXVE7ZY@!9wb9wdGoXv7n!cmG({ZyVm}l?Z1*k#Xp9-T2cx$^c@VpDo4! z814HYy-@Rl-K#6zV+rv*;=b7|ZT&*>oY!vPdn5ccLVF$nRT+I&v4H!min}EaIQJe7 z_sG|?DC3;7e@EFU(D1rI?!I>Wy19d<47nOoM+C4XqAVw z5euK%%Yu;Gh!&sT4uX@br*a2T#}StB{H4eV_W zGSYp-+qp^7`n3`!D#G>fmjvz^fTGnGYvct^;fqdv%}(}}VU4_kR+Jv74{gyWKM=Zs zibRmSz^~;>@ePB3l$2pP+m;((pF^wY@VVTxCw@RC+~}FeV>WQ*mbglOv6=d8cXZ+s zPVB+slyF^QvRJAjP`pr9U?OyZ8-fNo(z6{N2fu(0nkod0^em&va*j&`kUhxf5jw^{ zs0f~F0v&h6Ebl2@b{qiz9!C%^!FS^}5`NcyWewExLe1y=CBqrFL9#z|zRd>h16lOJ zcdi9ZKVS5g$h;3(wjZ)aNTu)>NCqI}@J(vvAIft@D11Sxh6I?SDDvL0*)Q22YUgd7 z{XwW9AHAF1a%S{T+~ax$1Xm9_pj?(93a^4SgZ9vu8$(_NrMqRzS& zmtRy-4$~>N&w6vnR?;@tMB#^w|BG#OE{;|qf#D1g{&ZA&ZJ;v$K|R^oC%Ocf2LTmp zBg+=90qc&SP`&o|b<8$-+94XL$o(}tTds{v`Ffr&yp7z5peS^X5Lj98-P z8ndqCQa>|Vhr@i^Zc)I9rOvYTbOgQ|UhFRutAtd{Ol6GxR?u;$;3{o;7c9IwAMIDw z{o=%$(ALXQ01@ctd`)n_q-+`^otkkBfghz`FQi{5IU0!8O8{W)H~3erY^Q zq$RJgda$Ja5T4xBoc(TWY03G#xEuC#z2~0$eL2VH$w7EG*W`lk_v=PH2^yoma`%AnM)~UAnZ1FGXe{xp4gK|+L|H%6^=>Mko<$>`5y4xB^{6o#) z)hL5@%wSF+XgQ+_sxr8RY|vqiSjk4|Jf$&>j1pq$m2{}*=?vDNxPP`X`Z*ZG8~o(= zKN(&3QI*wb2v!{0stzJuh57p*j;3?{M?WLuOqb2}r|A;=dgC(eZT#?grJmv^Nx z$#<%7hMU=WE2$;Kh^A_&1De2qWf?l=P@~E;5g=4BigPRj+V6*`#iFr%q+DR z_|>KNej>CReR^6VJk~llHv1~-Jn;gZ%O8Q3Vo&+yxvf@h4R%t1LrwZ@tu*i+ogvIQ zqW$RW3MhMZjRX%)2mP#+VmHcc?3^`Ej@x~uMm9<73KIrV5AoS7oN?Dby`4}Y4*~tB3Af1q#C-0`smG zg1v-F!8#RSZ_hi<4+aU@9D)o!|G*#d8WQ;H??>x-TrMcB@b9+S7j+spRVqE7T}+B; z+BT)eSat2OiRLvF;d1x=52VQIY(=zDkWLf%PQ9~5 z&86JCdff4pIFHR%wzH8y5wBkjTdeQ?^bnfZp-oa?e>8_mNNEaGcfQ^{t}&I~sw^2v zU-2V^Uj9!D#jYB42`lz$d4v$bwoTb9GV%^HJxeu_7HI-IRK9rqg&*kp`QJ6fpC_RM z`nWN`Rcp)=-NH3KPxyT>hWmNR;u#e0f?~-LjuBA9vRncxar05cUkcu+)7hdV)0Mj1 zp%f%QMCN_$>EY}!reIL2NU`DM@lq(~!HXfq)mUf+xcmcOHl-hM zfe;E{h*j=0eHIfz2ccpd8nw_Vuk~(-son$txBEQ1AW8_-hcM%fDFaMl7{>ftXrJs8 zIrw^5GGluQ$5W+vrYf=-{;Yhw2hc?l}-7(1_myASukAm@8QE6hAS^Rmi z*DZQ&q;cQ|>&DxSE}=K~H8#fHO-x}4?rP^EX0rK(u3%Wn>ZT+nHetH0qS4?Yu zIG{u37kq2_{N=0>s0r!AA7D|R2e?{T#Af%uHhv0^9umOY2u~gR zuYB{Q1IKcxLvlMcH66MA(yaLOZaS&7D$c~J-BNb(+T<;p_QrMS<|Y9Y3>6hkF&+t; zn0Q@>@C8IAIjq~ zeZUU#pl%4&ue^XAbTMoMh$6s&gLc<=LI=201EC}05x$ot5_%_NqzvBkvA(d{u@N}; zKK-z-85h~G@5%G0nb$z0A5kFU)SGDYqj8o$Ss?bu9^U+YiVP>L3Q#k2;VM@;(iypJrO|{7c^F1i@b(kn1lo0X(^@}aAfVy&j2^Syx_67(40v~UKpJ%7T*UHPO($dRJ zPPp=p#lB%JX+;GUUl}khS4zP_t+ixdx|E*Y>|r$-TW@5ZA6P$Ul^`kdbE4zqQ)z}S+9^rO*2F)LTMr#?HmU2p>$kj(jaTL(zoYTZ-QTj?ofmVCP zIujKStr|o567OFwLD6Db@pRMf{f`eLk3~aVy=IofamylTX(yA55BC=OH9GsDfu`xr z$It)yq7^<=Ikav+a-rpJNK%GqRzBwLDi$xx7nhm7Q6b%wFcF(`b|7P~z5+Aper@-nP8|Ch{+ghn$SKUvRV&xrY zB{5r(qv9&^&MP4*)5R|t?n9|AqUs^a4%?F6t>!4)^>k=iIAYX2&DWJ|j zmuHsDJyHk;{HjzuPsc-%XB|vO-Hwl110OZjOa< zvt0hk{vgE)PVT%=k%cN&S{{jjljI~uW5ty(0^W8k{+qBwA|`t%)@h?1TlKjs`MxX3 zsCS)%&>pbUZSq>}P{7Sp7?tW8ovT}0+SxBTO?LKq(-o84T2omWSY?=GydKp8<4H}m zeHB@2ij7^qS|C+1*>PaUWV0Tt`nL`IWu4&>z4qsCnha(yb$wx1;6CxTUbBCZXieq_ zV^z17{KQ^^nN;OFd%!S{zLOVMN;8V8PkkeLYd3%+3^O$1Z6VWXIonN@%OOz?TSIGq ze#zQ$mTm$EFXQ%n+)hzr_Yqo1ezx*qmmpQFgSX# zP(^!3wLxD;NArP_ujI(RQ+l*OT%TY((L%oZJ;v!vo#U!EXHhyX!-|cy?8q@bHb5kKeLu-y_E;*sUC-c) zBYOJ#A423WL%xb5?>V$VqmJmaw%byyuRkAt&bqD9v5gFjGiUX3B-j~Cua+~vnP|1u z(aJ)zc9nrLRfA-3`5zhX7G_&-7Fq6WJXHXu=-1MbMuxma%4sTmtcVf;j+*!H&dbqv zpfPde`0-~9agF)KG%oC25}a+}IWTebdam^LFt$}*KXbut@;8S`()@K1Z{*37_nibB zFVv=t=;iRFs{{lxmvFvZDIW4E4pX*u{_v{L)}v>dQ(%2A=p8UW(|s?OT_#uxqYVHW z;Ig3xF!eGOn0s`lujpzT*;JYVl{y+qDp_7Qe25LFJtMHB%FZTnMz; zT<>eG5K5mEBA-B|+qY6<`CACQ=h}RqYtI$Gm=kf;EjrUK{cG!-oixoy1X}Lg={~Rd zmpv7Q1ggFMtLR-UHN!lH-pUM)GeLlSXifP6PsWkCs2xLfHHCg`mr`iz$71i?Wi-g1 z9`B*XpG;lh{H?T1j}`D`gP~35&>mg{WbPk!4i;;iPZz~8nCPf63iqmGau>p<#f;|M zX|lI9U9Vs3CmSUS{i9xi#&j)kM^l|PuQ6)E+r!>I~ zf1E51z@Tm6TGY06TGQCHrR27yoq;s{lkhqOCS0v@;kR*xC<~%e9@5q4hCt1cw;}g! zh;eZYk9c^I4+9v5+u7?@eUntSy0J4n zfVD2R6~}(?$I)7aNl%SCW`AlZym|P-BW;Kly=dEU1(&&UU|7x^&0y=eYZxQI zE1!6jpGVfIxQlht^hL99i_f!cp8STF*~go+0Lepz&Xa}Lwu7@jLV~vUsCu%y{NlR= z$>>fL#mGZj6bB&he%BSzn=8DcR-b1wwhCm6&nu|3)oI)LLt&;Foe`_OZr|E%Q|Gru zsHO`U<5#et_~x;v~(WRIi{F~pY&xI=*c^d?n8ZFSr%W93OwGKyGz}J zzvAk_$=usqcjQcf;0S+69uz;wm=GW8vPbMOgZMcEU;#IMp#%M*PzVzpao)NjCDlrj zV?1MR449#5V5;51;Hw(S#*v$9W|SeN%IS7vybT-1W`+o-^Iqg8er; zKg~gg(B^|xbw5K2X%C^i2i?^RS++Y*__rS{+=gE7H1mheJBPN;c`?$-60#Z4Z9H3$ z9DlZSE&*AuA#a#w`|Kl+I_dZBT_CA0nT$P12I9}?z8?IfDkk#=A?uHJi5B}(N`Blx zWItb=M?8(2^rJ$h;>LGeWeX8k{NxxD)^G>#9<}02^7W;4scM%}HuMx15{iZK>0~XO zE*d7&y_;#?uvIKQ%8go^=p1&>tDo_Oy?dO?J^(QDI@X$7G4arkK6?r6g^uiIp`PGW zEqQI?-YkNhp_m5_ikX|8f#DES)4BAqT>7|rdKO<)Mc8;+YU2%wt2I0y(c705BhI5D zmJZ~EkLydfh6)h8+gGBk#O2+COAV`%`~4rm|3t!}IHfhs|B$c<*1tcAH2*EEF(SbM zc%hA>|3E5iE!(JbL6;7vg2JvO&IQIb4I*iy5G5iNS_Ikm=3-pjUuf*yC?BPpRBS{o zOEsl%@hcpm<#JJOM$2ELQ7U-)+|6F}@qSo(y7TPPix~DJ&ffHTfA@Lc!7BM=AZ-OHeZqv!Td3G>p~^Pdmk;D)IMhRG3%lf#U%692F< z`s8^{fS>%Y^)hLy}n>SWz;~!5#)Q3UO?&5_Di|}@Rb#=W-i*(LYUa&CC%rAg)+lI3EK7kRG z%)y%9`rOH0IIa>dM3vCnSJKedQd7b|TrniRxxc@;m=VN~13pVivx5^SS!WLddvys3 z=4XG(RF>v0emu6fvVlyxSV0(tts>1@JPz@X>b=!3oX3fy0AKUSib?|9ONkK1V;`nK z`}^%kg?esn3tO(&NglIJagG@Vk-JAc%D0zYMIk@d+;d?l>Cg4NgbG!KAhQqi7Bh!b zlpRB-L};u?$wUSwGs)NR%j^s}^Cz*rH}UAsOVQytu#S&Czc;dZ6vT;2h$FKG1jmy7 zGVcQGt4K*_Zf7K=i4g{DvtfHvopz#|fANWJxrDczM;heM7|UXEzn0Zn(eZ(1c<}W8 zsk&xxjrG77n@K{hx)wK3K5s^p);tyAQNT`0HAfj3g9SKoq`Uc!S4A@0D})K~NGcQ2u{8j&S)NSw6B=GJ%(2|L|_s!L-@v!+F2)kz;={mC3Wign0)ct|}7 zl&;2?7B?M+jEzLb?_jaw__U+vT+!!}f1KGDU@Y!(5xHrbb-JBS?uFf^1GnjfShvCY zMUUe!CXW+;NTC5Jfz>C29~fD7Q?KX6X8%d!EtRJ>;fQ0QX8VE}(74Bi9~ixhbk!?7 z@S?F;ePXjyQA?I-_dy3dmV^svOIyVzVA4WC3}! zND+Ce*vflVcID7*Es1*LPE>Y~(M>WD^wDGm)2>X#I8CuA3K{V%k}38kDKIqUq9~ar zEo50XW%6pkMJx9$?Kgi4BczHmEsup6LK%**INj=qxQgMva&}dexk=YxI|n}jXWc@h zuxBhYvPe>9zFhorOHqjh$?s}hlQSrM`ApLysGJ>Se(O-1bu!x=%QEZvBvXlzr4g7W z6&W~dlQc9;xNXiZ>O;K~Z2=v61`DgVY+_vU-^HPT@)|I8snH1PvZb0*+hU2@#StB4 z+Qulp9Uau@?NN$UJWi6u5@k~^w77pPPz%W=n{tA!c0T_UEa|#MxfJKN=(2$G3A?N* zF4|&clzVa1x^kku7HY-;hj?wq+c5^uVehDzieuspF$SyR>$qd&6V9_7XIysopAWV@ zk>ypuo6G!z5dsGPvb$S+^U5&`Bf)A)T~yLaCUOTusZMx9E_A$vqzbe_ExWfl=RVfv zBg}P`Y5$s6Jh--*$D%1M4s-2wy%zs&(<3DKXr3upeYRxD#L>`HXPJN{V?<@@Dou?+ zAp>T{SbhIJm9V)tCZsEGk7}KVuL4s0McoJ>0dd-UxhLmDk*?)t_QL0*>7GCw^8|r9 zRG*X5v_XS;7lBXFQawO7&}2hnfjFYKc}z8QIgW3>w>ymf?C7b7cN!d?fX=n&j)6i+ z4nZ7!W(HO<{KMPavNiv}-i@V*swIPdrSbLB#cTy-%u6n#M22KCWY+x&revK-lUER+ zl5NNVYM*j5(v-BOZHH6~dsF_Dt8n*6YtKJI>+ z`c*yeIR+!Cpr2L6$;!z~-(frbTzYV;T}hWx$Aze>FtNHhcZn;XNtx%%#grpmf!e+| zQE5CN6?;t0F9D#RqwvJJO8*lgW<(6YTE-ry>8_XPe0@X#q{zetNXw4H?eo z-2Kb9JCi5i%(?w-3gDzCMU#aRDyS^V+E>t z;8UL+0)#L5t{Vy!9wlz#9DWoH?dyjE+l@on)R+_Fc!vfPPNB4M1p8-62_mFFSn_~S z2aD)H|Y3wVYs@l4658d6} z2uO!CN=Sns9ny#H?js?HfW!f$JEXh28xAE6(ukxWAR@j4_x|_7^}R9P9^(wyW6y7{ zZ>>GoT(#F+_{!PY&rw){36-;AnZl>EW2H5sAI-4cWVT!3iZ|*kysTl@<_!zioz7g~ zd;^s1%w}fYA=Tyzi^oG&GM-U^JPnw^Yw$$n+pJ}btmR2Kl79V_RLGmnt~9TEPxTEV zs|+1`uh6~(&-s*{7RXezwHgO8tDpj<-h{_q2F)O_R3PZ_39+u-QKT>>?TV_fZ`3zI zLHQ`cH5#cO43gidsS>Bk3a`vfTVN{)yL`P}Jci*K+(LLnaiAiZX%B+^4$cfJ)>knlwCtnF zQ%ARyK@i%FrKnR?AlGb&k?*(>GAGL$BC2|P%*|i@Zm?|PhsTpg?LyVxis#PJ2G+OH z!!?P@hcpEu-L7p=d6BxT^tl7RH|{r8&uIYXPQD*jHGe1rdmoi`gz!Gecd{b=kXLCn z?#J{cxobPC4@Dp3^qyN6R&R378>@(c(=qP|$CgZY4k8?Ofam#1P%G&ZioV;Y1P$d? z{X^@jKG4 z3fOzkyG;z?JPp?j2tmD$oo2Z7B?^q|7F zR3OtW5y-`eaxX2L@!yy6M*w94sUppWtJWF6>xx~h@a&{l9|`^xI~)J)>rB}peeFlm zA?2&pb0H-{4eENEg=C6jX8M+vD1bx~-IUu?#rp?SUtX;g56${pWW63U^c=@* zN1#e{=S9wOPZM!aRIFwGf+K!^&*uhoD(h~naRzv zhcTr`tTTT}$3CeU0WnI~j7uNu!#|?)G|2KBst~s0x0%b)TmvZ&KOxXGV~k*?vum^> zxnQmdQyOErf=eiH)Un&tF=beFPJ>Gqy?m<{CL}m}s^-b+md(LkVAv@hF2bKLETFtO;6Takp35 zwIl>Wn6EVVhAXcrP@^7w;MPwJHqTkma_SGRGS3T~@dIggy3 zlbOB@^^_iRh8(k!XvHU&yo5o$%G}@#w8IZ)zX-XP78RVb@cwM=#rl?1(AY2Q_5p>t)_Y&>KS@ z-BJ_RCS{RdjDa3*Eum^cEB#0~*P8uD$37HP>sUgdo3~RqzPTGOE?wZMz9!;41@7+{ za~dt=b12J_F;0JfKebFUBJHTz|44wS)6n&rU?-^&ZcI`$i@J`!LufT`t>99zf9F!7 zf3;`pHEWY8GbLCll22W`+6)K9*?)-K3csw)kvwqJJAW+&ZZo|rAs^}a6kD66!<*Qu z{tr7!AW%6?1?;+%03|o$sPw`ZmHGPOn*W~i6G1-0!lIVXJs*z{S>AjFk1Ch;Z4`{M zU{1?x1q@>>SrfpeJ`Qu)(VnPPXltB3?oT47OW_L_vEV<>9o7GavS0?CPO~0GNgDY< zO~xR5x<4Dp+xn8*Ud(W?FK}O@{`%#-ffmu{Yx~G4O!I@ ztgz9|+sN(hCL1t@)(S#2g+A(f?jd7WUf z`I&3(Fpf{oJ`rTSG^fO`ES2*LJ6kl2+zn9`%TDscms((!k@nKb-RiflyQRyi#w8c& zA)v!{WXta(jfoh#XcaoJXTMe*61=tQUpbR*p`*R;p*j8dvEn_}Af=e(q@|t1hh_|; zMLj#OZVg=n=lFyR{k*N`13Rv7fBVh#%`eU`h7(H7tt9F`g^O?ULS!pEBnf_rVuz^9 zf|D*T5O0|#ZnK9@OEpo2Ak3sENEP9WlxG0?vijB`o9dgux{}0WZ-*0{e1>Vg9cRse4VaGa< zd2Wa~;Vk;elqZy+1J(Iv4JX&@C3WHu`IZCg_FT%`1OK-wk0``Y8PVgW>Tq*W{% zrw>gOLDsMrA2$X*g6DD!I-|YQMDX(WH_9{d_Lt@ILj+tz4^22CI0loNxsa6_UT&$r zR9d6-*AOUiUo$YVGHwAGV})R6?`Skc8S;5!5)=D2XZT;J=BV;4wSoOFkn}eV1XT&r zL)3svzTPObp~ZmhB^An#b5uRDdA|rTHQFNA7Zm}QE-}KS@$Ka>4<~GLC>3DuMSqGl zl_w)X1^^VW000{3^bIBGuh>p+w8B9679{@W)y+J@=z@f}+Dy^;7`BJBsIfKE^wI8% zyq&BluT-3>gy&h8M{F(3QPk~Pi@w{}QflNH5a>lE)Y&pY)-}{cbW1h$u8FRRrgu`7 z_i;2wIDWjp__?y-ldG9+jJ)5K`fMAGC*I&zJ3kf4Lp|QV>tq>4Kc`x&{-8t-VC)9FJJLq zq7#M*5z_2~etch@UajMXh;o+8Hspde3kDjor>L+Ze>J@5=ZEO*#xUp)e z>FUQ62&)>$AW?)>tz$TZ7lW5s@1`zeA_{;abQ}G+)Z*bu`NmP^Zv9;3C=@4n?`>H3 z>q}FOn@PIYb}z%$T7(@E?HLQ36WFqxeot>wsQp|&q08}5ezC+R{!UI?)H>;Xamryt z`Y0I&tvpJxbbf!|xe`TKKjuM>rCxQg(I@!=4BdGFd(ixsfSS^Rs=kiw(w$u=qa{7^ zSV)hTrof2yc5s`KEOHdpOw<=Ron=L=o>#)A`HgJ)wRU|K6z;B0Hhm)vKJ*b%ky((JD4SQcj4Ib1eG3(~`mGxZXD>poKAVKWR4MV%LUw%u7r zeG8>hG(Z9SKGu2rl9~9-L*aB@XOoGT6FijBVSCejo4NdSpoo`nbJwu|AKB@9W2}Nm z+})9DTYr1y*I$K2x}ry}yW(iN9ERpKb*1>Nw?J=HUv9JO)_yAsu5%Uvd+~qpNb;66 z%yfI|(&ITh>&Y;zNXHzwg=rY_wG{X(QKyuWQDD$l(c?GukJk&+j0$E7(mO5JK!KO%LZ)r;!uT+tjOacjnW8ZQv+zF$8LzFax zD;s32&g)^C8kXjm*l@y4Rs)H)&XT;}sY2%I3@_iY+Eg`cECCuHT zI*et(1I~mCL~aGG@|A{Cl6-}ReHnb$2o3|6#n3q#B@9siSJE3A+{4Z#PzijKW^#Oo zEsHV{3+}x0l@gX~d=6>lVP{+A6v?jZLQdLP^u?kE-zG+}ilg&6(-+naHVlUi76MQ? z9H((%HEA)cLldQN9Y?{~sa||jk>xvd6QRivz4Zwc6ulfb7SmRnY1R4_P1<8r4ZR;i z<(DNN->)6=ZJ+rj5V@IZbQaI=%tMNP^!qS$&Db3>kEMKY@X8xNAUae4+V(##4Nbs^ zlg|x)ZBtpN&a7#zuW+`YOBVL2Tqhm`k-usgRLs_4*2R5N;;5-*(J z_zjhPaqsiX-(;T#;59U4P`(y%tLr_PoyMsqTr{A-lER8|?X_ldF=}h55lX5@fE_+v zkk^ZwyxxnzE7l*|+iT63_=J)pulQS#D@RjQ8rA4#XD1yUTMf+aP^d|nHha(jk}XN% zwU!m#KOm%Xldi6#Ttc^)7;D%}8L8Qir3*6kp^y*``i}dG`Adgj@OJ>y6lal35cep@Xey0ob;0lCD%YIVn8cd1? z@Z;s@!f)5uk4l?XPC2~ja0153!iY%)w)@NQJBfEpW)~cf$v1~BTL26+Y&5Qz*1bM- z9x!RX&JKCAA9qwA@5PJAHz46HvDqrS)X%L>>va^t)&wn!wkl}1PU>Tgg1$R1?IhW7 z6vbgdg5~xv^m*4>6SK`zO`kF#38WjiGyV!^el;3jJQ>VOyvv;F#OVp66ozK046zx; z?ZS&Og0Vq-E_$hjnAPs!70`QluPiX$MGOXJ z<0bX{C9>KNCSw6PbCKuvB9gor3;+(54H01ZOZPWbvrIlgRrM$#05+MZ;$vcS$LQ;b z*zt?WC`FE=f(%J`&(vlto_E+=p~qrF8Zeq9+r_}d@&u#vH8wHH_tBUXo+wmiCI0CL zN+Yy`ZOQPypX0PyWkH!0vq`eQJsVQg+a4`-yVEWWyF;iB@m^6caWoluK67=xOfcU9 z+P>gbDW*w3zUaXVkflyXmJU1#CXd-b$>UGA#5}L0v0L9ce!nwRcyvrY203X}6o+LK zS@EWHL&Iu}@892`k$RW^E+8J0{PP~UTIUNr;Woq*Mko0$I4# z#ztQ-kIHGt$|((x46_c7jBmU=A01b7lvC2=@fN#1fL3~lI_T8N5!5(e$IO1_29?L<^%z?>l8*zo2 zoQ_y@xhGebwJE`iew!x)#%|TEW&WRYCDGBlVcJr6^anU}loe$|E+}0fhk|g-5h5Mo*jg!`|2AT zq3C2P$zja|f5E;9gh_}7lpB~>9{QvE&36x?a({*j+;7uGQ#}D-o{C&g3$-&km{>1= zM4Rn1&@-+YETZ6p%1w!+T3jZ>&tC)}_kv{I<`wJj63Iby!zW^EAWqr#rstwf5QZZwuhOVdNhM`pA;Gu`D$nddCR~J*`Jw=JE*a?FocLK`77 z@80#3$#WU+qXodEC%QNddRf8-BJB3$s3oR6 zZ%0WcUUVkyG`*N-d2$EhW6xG4dM^R`tUPv;t(#1Axfd8$C*^gWb$1??4Wjx zAcaom0DMi2j+1IaNW_^$b7D#|%KAlj(!D2R4QnmjutV15azBbTeesD)h5VYN&$#H0 z;CSOjOAV;Z{}-Z4$NLE0ZL_m)T3FB-#{uk0CR3DQTmyOSn3(mS_y%&?8^>-a&r!&5 z4R~Dbh!fWAK-~1sKl~6Y&8YU!{Rp}zJyIg!mVcB`B<7NQoZ}l^nk5f9lFZxnu16XysL$T9hf41{<=`jOn~QL?qQ=BrZg_r^2f z0g=>djZZdKI%5n@-=&fIqe9~PIjWRKyTe>&7YRsW_nyV;2xZ@GmXlGw zOlNdS)w~?SCKeG<}eLtb7_BJol#BXoS~|XXUI{%z$Kqit|aSB&72&6~t(fW4$glvQoqrJk67f4Mx8te$!)9gK9jc?K)NklleT6zKeVwZ{X*p z)yU;nR!WGFxR;_Db5-0tQ4KAaHd6j+mFksvp?2@C;eYA^Uj{GS{kkyWFoJOZo<9Ec zL0zG&9YebR{JMPz=I;^xZQbFv)vA++)*X0gP+e&-S3Es9Hh={rjxWmN%lg?QrtVUw z_gw-wB1iiJy)CCM;s`Yp`UP1(bzoWFV-;3skwy}0gLY7V{=6w9hacT~Yrd0# z$&M#uag}S_Ve(A2zV3&#+IaRE$FmUE7m*Y=inX|mtZbTqS4 z+M|B4F7#uY{58gARtAb3F+&tG#iNw+84hgWg&z?;V~Rgd<^!3_aYWwGzo6^p;cO(S z(%ebHDL$`LMSi^H1Qt>D;B-Q(#~E(TPWH%7cEHJ@iY_(#lz4z|-U#e+7%>OUq=dHDRGOnu| zK{pMNqJf`TN`X8`HSljR(G|Iqwga>H7)#~Q31Bfw>#W##<)@~N2A>y(Sv_`tjgo|K z?r8p2>UYpl*_MytS2R0)1+9!<6gQY|83EL06?r<)P z6hH1;f{C^73NGq-x;dBrII%gi0e8HKP9)Kgu1I{nts3)OO1`RwlAc;AFz2P}87+Ua z?Jg3%`Y1f8TU$<4Q)ubqLUI;QL?~U7-`2CR4+O3F;|uxuA7tIS^1Nkg2}(-{N%Fl* zbP&{RbjVqWugWxwlHdjL#Zcn5DPvm7vTPZFXjp%U9S zLj)MZDVlMWxUK6n-&?P&2& zFo68U@vgn@RX;b#PUj022bep{&M^k&8)H_r(A;U)2~~&oK6tt03FjPat%F{58EA2M z6*-cF&a0(ISwDL4rFU6^i2MQ;W1-)y5lg>Vh(BS^2aXu&_L!0!N#ewOP<^J_$7-lr z`8c~r>s-o``}{;oN=F)@30YE_V0DPIv%G_iPEj}dXS7z-N=&t-zUVh_ zba&Sj7jLqM{C@Pd>}yx_et(^f;bM314R2uuqB;c?Z3%?6@ zQRjCYmFB!YZ2%y{a$qPwo!YbTdLeXVTn4O>UohC?koIfutlmg-=tx<{`G{AAarwyv z<8s!7mw=3T?q=2o09y-&cYW8kgF_od-U)J@(!~qlL7j+-SwYswU|%gqp(mt?{o(9J7#&3W*>dbdI$~W<}(HHAHDbKk?OZ;_wOAGh|Z(+o!$s zqb=fwZ~-VZyLgoR$C@@@j)*EPHaov&wmpjroI}RJL+j}Z?U8(Ue1Kgg6C5s6A@vqS zh@IyU0eRy{@WGPZ2>pTy;X~S`^TDO_nZqeu=y!6RX8Ds>Hah_dgmTVleXw%&pXox| zQ*xNU#b@H|7{#+Xr%d|tp5ty{z-N3Pu>AOZMw04`W`jI?^iT^#OSm)L5> z4({{?<+R|oY_MG`di=s?WBso1hE0X z#FL@_-kw`=U-y3zX#Z0TxJ9)6jj(VwHnRo(zk$%k2mp=q_V;y*{BrwMD)xU<0+06+ z!`B2rrxaj@2x9vP9^K>p;7E-Bse=Bk2>`(UC60pq-$OFMx_uP)b?oeGyA(k&i_jnK z10C-0w>rSeY*>Giis`>4WrT1iVML1vZl}U${V(-@k4yjncpj)mLcRl{l2HEv`ZxGC z0KoPDM1gq+8W^Iw&;Q?0+yDUQ1Nk4=ckRz_b%XF>Lo`9|Z7wAWKYrr(cl|0PO|+bJYYSN#4mD(GvYZ?BB0R{%ajz;kfQg%xtr?p$&=hFp=*sT+?-?@poXD+~TiC6&++NV7 z$G@-J>S}HLmuvXDqH~(sT0N-kx9I4Bvjh<+Tn%b$T>k?@|3b^$7_2%%0!AD8$Cz*B zxeb9)`OxRP&>zzSd3rN&mOC90*I%oi|II5H2Xb5D*uYyMunL6weI~q!{*bf}d9gXG5TN-m7cWTL}=gC-KUOTjJ}vclp--fc}Tte+N7Ofbatzy#-LymAGH9_q!&n4`lsI zpk>E%U-m&)<$-K)Ih4%PKdJt@vqX=oyH|QWjelR8q-q`>E delta 28638 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c19dc09..704f671 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue May 22 17:01:34 CEST 2018 +#Thu Jun 07 17:33:27 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index cccdd3d..9d82f78 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash ############################################################################## ## @@ -6,6 +6,42 @@ ## ############################################################################## +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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 +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -24,46 +60,6 @@ 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. @@ -89,7 +85,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -154,19 +150,11 @@ if $cygwin ; then esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") } -APP_ARGS=$(save "$@") +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -# 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" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..aec9973 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@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= + 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 @@ -46,9 +46,10 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -59,6 +60,11 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line