Version

app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "com.tobedecided.dynamicdialer"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/tobedecided/dynamicdialer/MainActivity.java

@@ -1,6 +1,7 @@
 package com.tobedecided.dynamicdialer;
 
 import android.app.LoaderManager;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.Intent;
@@ -35,6 +36,9 @@ public class MainActivity extends AppCompatActivity implements LoaderManager.Loa
     private Toolbar toolbar;
     private TabLayout tabLayout;
     private ViewPager viewPager;
+    private boolean firstLaunch;
+    public ProgressDialog progressDialog;
+
 
     public static long getContactIDFromNumber(String contactNumber, Context context) {
         Uri uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,
@@ -56,7 +60,7 @@ public static long getContactIDFromNumber(String contactNumber, Context context)
         return contactId.equals("") ? 0 : Long.parseLong(contactId);
     }
 
-    public static void sendLogs(String body, final SharedPreferences sharedPreferences) {
+    public void sendLogs(String body, final SharedPreferences sharedPreferences) {
         RequestBody requestBody = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), body);
         RetrofitInterface retrofitInterface = ServiceGenerator.createService(RetrofitInterface.class);
         retrofitInterface.sendSource("application/json", "bhavesh2109", "b5265ab5defd322e797052263c4f04e1bcb53d42", requestBody).enqueue(new Callback<GsonModels.BigMLSourceResponse>() {
@@ -87,6 +91,8 @@ public void onResponse(Call<GsonModels.BigMLModelResponse> call, Response<GsonMo
                                             SharedPreferences.Editor editor = sharedPreferences.edit();
                                             editor.putString("resource2", resource2);
                                             editor.apply();
+
+                                            progressDialog.setMessage("Training your machine learning model...\nThis may take a few minutes during the first launch.");
                                         }
                                     }
 
@@ -135,6 +141,21 @@ public void onClick(View view) {
             }
         });
         getLoaderManager().initLoader(URL_LOADER, null, MainActivity.this);
+
+        SharedPreferences sharedPreferences = getSharedPreferences("DynamicDialer", Context.MODE_PRIVATE);
+        firstLaunch = sharedPreferences.getBoolean("FirstLaunch", true);
+
+        progressDialog = new ProgressDialog(this, R.style.AppCompatAlertDialogStyle);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setMessage("Fetching Logs...");
+        progressDialog.setCancelable(false);
+
+        if (firstLaunch) {
+            progressDialog.show();
+            SharedPreferences.Editor editor = getSharedPreferences("DynamicDialer", Context.MODE_PRIVATE).edit();
+            editor.putBoolean("FirstLaunch", false);
+            editor.apply();
+        }
     }
 
     private void setupViewPager(ViewPager viewPager) {
@@ -144,33 +165,33 @@ private void setupViewPager(ViewPager viewPager) {
         viewPager.setAdapter(adapter);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_about) {
-            Intent intent = new Intent(MainActivity.this, AboutActivity.class);
-            startActivity(intent);
-            return true;
-        } else if (id == R.id.action_privacy) {
-            Intent intent = new Intent(MainActivity.this, PrivacyActivity.class);
-            startActivity(intent);
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        // Inflate the menu; this adds items to the action bar if it is present.
+//        getMenuInflater().inflate(R.menu.menu_main, menu);
+//        return true;
+//    }
+
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        // Handle action bar item clicks here. The action bar will
+//        // automatically handle clicks on the Home/Up button, so long
+//        // as you specify a parent activity in AndroidManifest.xml.
+//        int id = item.getItemId();
+//
+//        //noinspection SimplifiableIfStatement
+//        if (id == R.id.action_about) {
+//            Intent intent = new Intent(MainActivity.this, AboutActivity.class);
+//            startActivity(intent);
+//            return true;
+//        } else if (id == R.id.action_privacy) {
+//            Intent intent = new Intent(MainActivity.this, PrivacyActivity.class);
+//            startActivity(intent);
+//            return true;
+//        }
+//
+//        return super.onOptionsItemSelected(item);
+//    }
 
     @Override
     public android.content.Loader<Cursor> onCreateLoader(int id, Bundle args) {

app/src/main/java/com/tobedecided/dynamicdialer/PredictionsFragment.java

@@ -31,7 +31,9 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import okhttp3.RequestBody;
 import retrofit2.Call;
@@ -131,7 +133,7 @@ public Loader<Cursor> onCreateLoader(int id, Bundle args) {
                             case URL_LOADER:
                                 // Returns a new CursorLoader
                                 return new CursorLoader(
-                                        getContext(),   // Parent activity context
+                                        getActivity(),   // Parent activity context
                                         CallLog.Calls.CONTENT_URI,        // Table to query
                                         null,     // Projection to return
                                         null,            // No selection clause
@@ -143,8 +145,13 @@ public Loader<Cursor> onCreateLoader(int id, Bundle args) {
                         }
                     }
 
+
                     @Override
                     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+                        if (data.isClosed()) {
+                            onStart();
+                            return;
+                        }
                         int name = data.getColumnIndex(CallLog.Calls.CACHED_NAME);
                         int number = data.getColumnIndex(CallLog.Calls.NUMBER);
                         int type = data.getColumnIndex(CallLog.Calls.TYPE);
@@ -214,7 +221,8 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
                         sb.append("\"}");
 
                         SharedPreferences sharedPreferences = getContext().getSharedPreferences("DynamicDialer", Context.MODE_PRIVATE);
-                        MainActivity.sendLogs(sb.toString(), sharedPreferences);
+                        ((MainActivity)getActivity()).sendLogs(sb.toString(), sharedPreferences);
+                        ((MainActivity)getActivity()).progressDialog.dismiss();
                     }
 
                     @Override
@@ -279,9 +287,15 @@ public void displayPredictions(GsonModels.BigMLPredictionsResponse bigMLPredicti
         if (probabilities == null)
             return;
         predictionList = new ArrayList<>();
+        Map<String, Boolean> map = new HashMap<String, Boolean>();
         for (int i = 0; i < probabilities.size(); i++) {
-            if (!(getContactName(getContext(), probabilities.get(i).get(0)) == null) && !getContactName(getContext(), probabilities.get(i).get(0)).isEmpty())
-                predictionList.add(new Prediction(getContactIDFromNumber(probabilities.get(i).get(1), getContext()), getContactName(getContext(), probabilities.get(i).get(0)), probabilities.get(i).get(0), Double.parseDouble(probabilities.get(i).get(1))));
+            if (!(getContactName(getContext(), probabilities.get(i).get(0)) == null) && !getContactName(getContext(), probabilities.get(i).get(0)).isEmpty()) {
+                String contactNumber = probabilities.get(i).get(0);
+                if(!map.containsKey(contactNumber)) {
+                    map.put(contactNumber, true);
+                    predictionList.add(new Prediction(getContactIDFromNumber(probabilities.get(i).get(1), getContext()), getContactName(getContext(), probabilities.get(i).get(0)), probabilities.get(i).get(0), Double.parseDouble(probabilities.get(i).get(1))));
+                }
+            }
         }
         Collections.sort(predictionList, Prediction.Comparators.PROBABILITY);
         predictionsAdapter = new PredictionsAdapter(predictionList, getActivity(), new ItemClickListener() {

app/src/main/res/menu/menu_main.xml

@@ -2,15 +2,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.tobedecided.dynamicdialer.MainActivity">
-    <item
-        android:id="@+id/action_about"
-        android:orderInCategory="100"
-        android:title="@string/action_about"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_about"-->
+        <!--android:orderInCategory="100"-->
+        <!--android:title="@string/action_about"-->
+        <!--app:showAsAction="never" />-->
 
-    <item
-        android:id="@+id/action_privacy"
-        android:orderInCategory="50"
-        android:title="@string/action_privacy"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_privacy"-->
+        <!--android:orderInCategory="50"-->
+        <!--android:title="@string/action_privacy"-->
+        <!--app:showAsAction="never" />-->
 </menu>

app/src/main/res/values/styles.xml

@@ -23,4 +23,10 @@
         <item name="android:windowBackground">@drawable/splash</item>
     </style>
 
+    <style name="AppCompatAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@android:color/black</item>
+        <item name="android:textColorPrimary">@android:color/darker_gray</item>
+        <item name="android:background">@android:color/white</item>
+    </style>
+
 </resources>

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sun Oct 08 14:07:57 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip