forked from github/wulkanowy-mirror
Add auto update (#42)
This commit is contained in:
parent
450805bff4
commit
844230956a
@ -1,6 +1,5 @@
|
|||||||
# Wulkanowy
|
# Wulkanowy
|
||||||
|
|
||||||
[![Codacy grade](https://img.shields.io/codacy/grade/b0365aa6584a4c1abf36141204bc8de3.svg?style=flat-square)](https://www.codacy.com/app/wulkanowy/wulkanowy)
|
|
||||||
[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
|
[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
|
||||||
[![Dependency Status](https://www.versioneye.com/user/projects/5969ff0b0fb24f004f8c711b/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5969ff0b0fb24f004f8c711b)
|
[![Dependency Status](https://www.versioneye.com/user/projects/5969ff0b0fb24f004f8c711b/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5969ff0b0fb24f004f8c711b)
|
||||||
[![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/wulkanowy)
|
[![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/wulkanowy)
|
||||||
@ -8,6 +7,6 @@
|
|||||||
[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
|
[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
|
||||||
[![Bintray](https://img.shields.io/bintray/v/wulkanowy/wulkanowy/api.svg?style=flat-square)](https://bintray.com/wulkanowy/wulkanowy/api)
|
[![Bintray](https://img.shields.io/bintray/v/wulkanowy/wulkanowy/api.svg?style=flat-square)](https://bintray.com/wulkanowy/wulkanowy/api)
|
||||||
|
|
||||||
[Pobierz wersję rozwojową](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/app-debug.apk)
|
[Pobierz wersję rozwojową](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/app-release-bitrise-signed.apk)
|
||||||
|
|
||||||
Wulkanowy to projekt aplikacji na androida ułatwiającej używanie dziennika VULCANa.
|
Wulkanowy to projekt aplikacji na androida ułatwiającej używanie dziennika VULCANa.
|
||||||
|
@ -5,7 +5,7 @@ apply from: '../android-sonarqube.gradle'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 27
|
compileSdkVersion 27
|
||||||
buildToolsVersion "27.0.2"
|
buildToolsVersion "27.0.3"
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "io.github.wulkanowy"
|
applicationId "io.github.wulkanowy"
|
||||||
testApplicationId "io.github.tests.wulkanowy"
|
testApplicationId "io.github.tests.wulkanowy"
|
||||||
@ -15,7 +15,10 @@ android {
|
|||||||
versionName "0.1.0"
|
versionName "0.1.0"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables.useSupportLibrary = true
|
vectorDrawables.useSupportLibrary = true
|
||||||
|
buildConfigField "String", "UPDATE_URL", "\"https://bitrise-redirector.herokuapp.com" +
|
||||||
|
"/v0.1/apps/daeff1893f3c8128/builds/" + "${getCurrentGitBranch()}" + "/artifacts/app-release-bitrise-signed.apk/info\""
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
@ -59,6 +62,7 @@ dependencies {
|
|||||||
implementation 'org.greenrobot:greendao:3.2.2'
|
implementation 'org.greenrobot:greendao:3.2.2'
|
||||||
implementation 'com.jakewharton:butterknife:8.8.1'
|
implementation 'com.jakewharton:butterknife:8.8.1'
|
||||||
implementation 'joda-time:joda-time:2.9.9'
|
implementation 'joda-time:joda-time:2.9.9'
|
||||||
|
implementation 'com.github.javiersantos:AppUpdater:2.6.4'
|
||||||
|
|
||||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
|
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
|
||||||
|
|
||||||
@ -71,3 +75,20 @@ dependencies {
|
|||||||
androidTestImplementation 'com.android.support.test:runner:1.0.1'
|
androidTestImplementation 'com.android.support.test:runner:1.0.1'
|
||||||
androidTestImplementation 'org.mockito:mockito-android:2.11.0'
|
androidTestImplementation 'org.mockito:mockito-android:2.11.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static def getCurrentGitBranch() {
|
||||||
|
if (gitBranch() == "HEAD") {
|
||||||
|
return System.getenv("BITRISE_GIT_BRANCH")
|
||||||
|
}
|
||||||
|
|
||||||
|
return gitBranch()
|
||||||
|
}
|
||||||
|
|
||||||
|
static def gitBranch() {
|
||||||
|
def branch = "null"
|
||||||
|
def proc = "git rev-parse --abbrev-ref HEAD".execute()
|
||||||
|
proc.in.eachLine { line -> branch = line }
|
||||||
|
proc.err.eachLine { line -> println line }
|
||||||
|
proc.waitFor()
|
||||||
|
branch
|
||||||
|
}
|
||||||
|
@ -7,6 +7,9 @@
|
|||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
|
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||||
|
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||||
|
|
||||||
<uses-sdk tools:overrideLibrary="com.thoughtbot.expandablerecyclerview" />
|
<uses-sdk tools:overrideLibrary="com.thoughtbot.expandablerecyclerview" />
|
||||||
|
|
||||||
@ -46,6 +49,16 @@
|
|||||||
<action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
|
<action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
|
<provider
|
||||||
|
android:name="android.support.v4.content.FileProvider"
|
||||||
|
android:authorities="${applicationId}.fileprovider"
|
||||||
|
android:exported="false"
|
||||||
|
android:grantUriPermissions="true">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
|
android:resource="@xml/provider_paths" />
|
||||||
|
</provider>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
189
app/src/main/java/io/github/wulkanowy/services/Updater.java
Normal file
189
app/src/main/java/io/github/wulkanowy/services/Updater.java
Normal file
@ -0,0 +1,189 @@
|
|||||||
|
package io.github.wulkanowy.services;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.app.DownloadManager;
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.IntentFilter;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.database.Cursor;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.Environment;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
|
import android.support.design.widget.Snackbar;
|
||||||
|
import android.support.v4.app.ActivityCompat;
|
||||||
|
import android.support.v4.content.ContextCompat;
|
||||||
|
import android.support.v4.content.FileProvider;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.github.javiersantos.appupdater.AppUpdaterUtils;
|
||||||
|
import com.github.javiersantos.appupdater.enums.AppUpdaterError;
|
||||||
|
import com.github.javiersantos.appupdater.enums.UpdateFrom;
|
||||||
|
import com.github.javiersantos.appupdater.objects.Update;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
|
import io.github.wulkanowy.BuildConfig;
|
||||||
|
import io.github.wulkanowy.R;
|
||||||
|
|
||||||
|
public class Updater {
|
||||||
|
|
||||||
|
private static final String DEBUG_TAG = "WulkanowyUpdater";
|
||||||
|
|
||||||
|
private static final int PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE = 0;
|
||||||
|
|
||||||
|
private Activity activity;
|
||||||
|
|
||||||
|
private Update update;
|
||||||
|
|
||||||
|
private DownloadManager downloadManager;
|
||||||
|
|
||||||
|
private BroadcastReceiver onComplete = new BroadcastReceiver() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
DownloadManager.Query query = new DownloadManager.Query();
|
||||||
|
Cursor c = downloadManager.query(query);
|
||||||
|
if (c.moveToFirst()) {
|
||||||
|
String uriString = c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
|
||||||
|
|
||||||
|
if (uriString.substring(0, 7).matches("file://")) {
|
||||||
|
uriString = uriString.substring(7);
|
||||||
|
}
|
||||||
|
|
||||||
|
File file = new File(uriString);
|
||||||
|
|
||||||
|
Intent install;
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||||
|
install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
|
||||||
|
install.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||||
|
install.setData(FileProvider.getUriForFile(context,
|
||||||
|
BuildConfig.APPLICATION_ID + ".fileprovider", file));
|
||||||
|
} else {
|
||||||
|
install = new Intent(Intent.ACTION_VIEW);
|
||||||
|
install.setDataAndType(Uri.parse("file://" + file.getAbsolutePath()),
|
||||||
|
"application/vnd.android.package-archive");
|
||||||
|
}
|
||||||
|
|
||||||
|
context.startActivity(install);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public Updater(Activity activity) {
|
||||||
|
this.activity = activity;
|
||||||
|
|
||||||
|
downloadManager = (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
|
||||||
|
activity.registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void downloadUpdate() {
|
||||||
|
if (ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
||||||
|
== PackageManager.PERMISSION_GRANTED) {
|
||||||
|
startDownload();
|
||||||
|
} else {
|
||||||
|
requestWriteStoragePermission();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void requestWriteStoragePermission() {
|
||||||
|
ActivityCompat.requestPermissions(activity,
|
||||||
|
new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
|
||||||
|
PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startDownload() {
|
||||||
|
Snackbar.make(activity.findViewById(R.id.fragment_container), "Downloading started.", Snackbar.LENGTH_SHORT).show();
|
||||||
|
|
||||||
|
String path = Environment.getExternalStorageDirectory().toString() + File.separator +
|
||||||
|
Environment.DIRECTORY_DOWNLOADS + File.separator + "wulkanowy";
|
||||||
|
|
||||||
|
File dir = new File(path);
|
||||||
|
if(!dir.mkdirs()) {
|
||||||
|
for (String aChildren : dir.list()) {
|
||||||
|
new File(dir, aChildren).delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DownloadManager.Request request = new DownloadManager.Request(Uri.parse(update.getUrlToDownload().toString()))
|
||||||
|
.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE)
|
||||||
|
.setAllowedOverRoaming(false)
|
||||||
|
.setTitle("Wulkanowy v" + update.getLatestVersionCode())
|
||||||
|
.setDescription(update.getLatestVersion())
|
||||||
|
.setVisibleInDownloadsUi(true)
|
||||||
|
.setMimeType("application/vnd.android.package-archive")
|
||||||
|
.setDestinationUri(Uri.fromFile(new File(path + File.separator + update.getLatestVersion() + ".apk")));
|
||||||
|
|
||||||
|
downloadManager.enqueue(request);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onRequestPermissionsResult(int requestCode, @NonNull int[] grantResults) {
|
||||||
|
if (requestCode == PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE) {
|
||||||
|
if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
|
||||||
|
downloadUpdate();
|
||||||
|
} else {
|
||||||
|
Snackbar.make(activity.findViewById(R.id.fragment_container),
|
||||||
|
"Write storage permission request was denied.",
|
||||||
|
Snackbar.LENGTH_LONG)
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Updater checkForUpdates() {
|
||||||
|
AppUpdaterUtils appUpdaterUtils = new AppUpdaterUtils(activity)
|
||||||
|
.setUpdateFrom(UpdateFrom.JSON)
|
||||||
|
.setUpdateJSON(BuildConfig.UPDATE_URL)
|
||||||
|
.withListener(new AppUpdaterUtils.UpdateListener() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSuccess(final Update currentUpdate, Boolean isUpdateAvailable) {
|
||||||
|
Log.d(DEBUG_TAG, "Latest Version: " + currentUpdate.getLatestVersion());
|
||||||
|
Log.d(DEBUG_TAG, "Latest Version Code: " + currentUpdate.getLatestVersionCode().toString());
|
||||||
|
Log.d(DEBUG_TAG, "URL: " + currentUpdate.getUrlToDownload().toString());
|
||||||
|
Log.d(DEBUG_TAG, "Is update available?: " + Boolean.toString(isUpdateAvailable));
|
||||||
|
|
||||||
|
update = currentUpdate;
|
||||||
|
showDialog(isUpdateAvailable);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFailed(AppUpdaterError error) {
|
||||||
|
Log.e(DEBUG_TAG, "Something went wrong");
|
||||||
|
Log.e(DEBUG_TAG, error.toString());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
appUpdaterUtils.start();
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void showDialog(boolean isUpdateAvailable) {
|
||||||
|
if (isUpdateAvailable) {
|
||||||
|
new AlertDialog.Builder(activity)
|
||||||
|
.setTitle("Update is available")
|
||||||
|
.setMessage("Update to version " + update.getLatestVersionCode().toString() +
|
||||||
|
" is available. Your version is " + BuildConfig.VERSION_CODE + ". Update?")
|
||||||
|
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
|
||||||
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
|
downloadUpdate();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
|
||||||
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
|
dialog.dismiss();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onDestroy(Activity activity) {
|
||||||
|
activity.unregisterReceiver(onComplete);
|
||||||
|
}
|
||||||
|
}
|
@ -4,6 +4,7 @@ import android.app.Activity;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
import android.support.customtabs.CustomTabsIntent;
|
import android.support.customtabs.CustomTabsIntent;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.view.KeyEvent;
|
import android.view.KeyEvent;
|
||||||
@ -21,6 +22,7 @@ import android.widget.TextView;
|
|||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
|
||||||
import io.github.wulkanowy.R;
|
import io.github.wulkanowy.R;
|
||||||
|
import io.github.wulkanowy.services.Updater;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A login screen that offers login via email/password.
|
* A login screen that offers login via email/password.
|
||||||
@ -35,11 +37,15 @@ public class LoginActivity extends Activity {
|
|||||||
|
|
||||||
private AutoCompleteTextView symbolView;
|
private AutoCompleteTextView symbolView;
|
||||||
|
|
||||||
|
private Updater updater;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_login);
|
setContentView(R.layout.activity_login);
|
||||||
|
|
||||||
|
updater = new Updater(this).checkForUpdates();
|
||||||
|
|
||||||
// Set up the login form.
|
// Set up the login form.
|
||||||
emailView = findViewById(R.id.email);
|
emailView = findViewById(R.id.email);
|
||||||
passwordView = findViewById(R.id.password);
|
passwordView = findViewById(R.id.password);
|
||||||
@ -67,6 +73,12 @@ public class LoginActivity extends Activity {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||||
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
|
updater.onRequestPermissionsResult(requestCode, grantResults);
|
||||||
|
}
|
||||||
|
|
||||||
private TextView.OnEditorActionListener getTextViewSignInListener() {
|
private TextView.OnEditorActionListener getTextViewSignInListener() {
|
||||||
return new TextView.OnEditorActionListener() {
|
return new TextView.OnEditorActionListener() {
|
||||||
@Override
|
@Override
|
||||||
@ -215,4 +227,10 @@ public class LoginActivity extends Activity {
|
|||||||
}
|
}
|
||||||
return super.dispatchTouchEvent(ev);
|
return super.dispatchTouchEvent(ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
updater.onDestroy(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -158,7 +158,7 @@ public class LoginTask extends AsyncTask<Void, String, Integer> {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Snackbar.make(activity.get().findViewById(R.id.coordinatorLayout),
|
Snackbar.make(activity.get().findViewById(R.id.fragment_container),
|
||||||
messageID, Snackbar.LENGTH_LONG).show();
|
messageID, Snackbar.LENGTH_LONG).show();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,7 @@ import android.support.v7.app.AppCompatActivity;
|
|||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import io.github.wulkanowy.R;
|
import io.github.wulkanowy.R;
|
||||||
|
import io.github.wulkanowy.services.Updater;
|
||||||
import io.github.wulkanowy.ui.main.attendance.AttendanceFragment;
|
import io.github.wulkanowy.ui.main.attendance.AttendanceFragment;
|
||||||
import io.github.wulkanowy.ui.main.board.BoardFragment;
|
import io.github.wulkanowy.ui.main.board.BoardFragment;
|
||||||
import io.github.wulkanowy.ui.main.grades.GradesFragment;
|
import io.github.wulkanowy.ui.main.grades.GradesFragment;
|
||||||
@ -26,6 +27,10 @@ public class DashboardActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
private TimetableFragment timetableFragment = new TimetableFragment();
|
private TimetableFragment timetableFragment = new TimetableFragment();
|
||||||
|
|
||||||
|
private Updater updater;
|
||||||
|
|
||||||
|
private boolean showed;
|
||||||
|
|
||||||
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
|
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
|
||||||
= new BottomNavigationView.OnNavigationItemSelectedListener() {
|
= new BottomNavigationView.OnNavigationItemSelectedListener() {
|
||||||
|
|
||||||
@ -87,6 +92,21 @@ public class DashboardActivity extends AppCompatActivity {
|
|||||||
.replace(R.id.fragment_container, currentFragment).commit();
|
.replace(R.id.fragment_container, currentFragment).commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onStart() {
|
||||||
|
super.onStart();
|
||||||
|
if (!showed) {
|
||||||
|
updater = new Updater(this).checkForUpdates();
|
||||||
|
showed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||||
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
|
updater.onRequestPermissionsResult(requestCode, grantResults);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSaveInstanceState(Bundle outState) {
|
public void onSaveInstanceState(Bundle outState) {
|
||||||
super.onSaveInstanceState(outState);
|
super.onSaveInstanceState(outState);
|
||||||
@ -104,4 +124,10 @@ public class DashboardActivity extends AppCompatActivity {
|
|||||||
moveTaskToBack(true);
|
moveTaskToBack(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
updater.onDestroy(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,14 +32,16 @@ public class SplashActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void executeOnRunApp() {
|
private void executeOnRunApp() {
|
||||||
|
Intent intent;
|
||||||
|
|
||||||
if (getSharedPreferences("LoginData", Context.MODE_PRIVATE).getLong("userId", 0) == 0) {
|
if (getSharedPreferences("LoginData", Context.MODE_PRIVATE).getLong("userId", 0) == 0) {
|
||||||
Intent intent = new Intent(this, LoginActivity.class);
|
intent = new Intent(this, LoginActivity.class);
|
||||||
startActivity(intent);
|
|
||||||
} else {
|
} else {
|
||||||
new FullSyncJob().scheduledJob(getApplicationContext());
|
new FullSyncJob().scheduledJob(getApplicationContext());
|
||||||
|
|
||||||
Intent intent = new Intent(this, DashboardActivity.class);
|
intent = new Intent(this, DashboardActivity.class);
|
||||||
startActivity(intent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
android:id="@+id/coordinatorLayout"
|
android:id="@+id/fragment_container"
|
||||||
tools:context="io.github.wulkanowy.ui.login.LoginActivity"
|
tools:context="io.github.wulkanowy.ui.login.LoginActivity"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
12
app/src/main/res/xml/provider_paths.xml
Normal file
12
app/src/main/res/xml/provider_paths.xml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<paths>
|
||||||
|
<external-path
|
||||||
|
name="external_files"
|
||||||
|
path="." />
|
||||||
|
<external-path
|
||||||
|
name="external_storage_root"
|
||||||
|
path="." />
|
||||||
|
<external-path
|
||||||
|
name="files_root"
|
||||||
|
path="Android/data/io.github.wulkanowy" />
|
||||||
|
</paths>
|
@ -37,6 +37,7 @@ allprojects {
|
|||||||
jcenter()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'https://maven.google.com' }
|
maven { url 'https://maven.google.com' }
|
||||||
|
maven { url "https://jitpack.io" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user